Fixes for messaging.