Fixed some visible bugs in the client