Small fixes to support major server refactor