Server connection tweaks