Fixed some issues with messaging.