some important fixes for messaging