Well, stomping on the first bug is not exactly a surgical approach, but the point is generally taken.
By the way, contrary to your original thinking, replacing the switch also solved the other issue, as expected.
Word to the wise: Understand you want to sell your services. Perhaps instead of...