Fixed multiple little issues with server log handshaking