Multiserver fixes

Various misc fixes to get server to server working.
Did you mean to do this here?