Bugfixes, development towards ServerBase