More ServerProtocol tweaks.