Soem fixes to the client