Bugfix in Server and CS Fixes.