for messaging fixes