Finish the server connection tweaks (derp)