fixes on the client