Fixes for sending messages.