More tweaking of messages