Multiserver fixes

Various misc fixes to get server to server working.
I don't want to forget it once the example config gets merged. Doing this here will force a merge conflict so I don't forget.