More messaging fixes