cosmetic fixes for messages