Fixed confused client/server keys and related logging