Server Refactoring, Bugfixes for Building