Fix some loose ends with messaging and server