Fixes to both client-side and server-size involving connecting to a server using a key.