Quick changes to client and server