fixes for the client