Messaging Bug Fixes