Multiserver fixes

Various misc fixes to get server to server working.