Fixed some stuff on the server and the client