Fixed client and server errors