(Server, MessagePasser) Some fixups missed in @7e5cf7a