Bug fixes on the client