[#149]Fix server switching bugs that were confusing testers