Multiserver fixes

Various misc fixes to get server to server working.
Oops.

This should probably also have the `users=[user]` keyword argument.