more fixes for the client