Updates to make the client compatible with the server