Messaging system fixes