Fleshing out some server communication bugs