messaging fixes