Fixed a few bugs with the new server refactoring.