small messaging fixes