Small messaging fixes.