CS fixes and bugfix client