Bugfixes for the Server and the Service