Tweak messages

Thanks Siebrand very much.

Change-Id: I65907a32ca67fdf09067e5231c8e4af88cd0834b
Merge "Tweak messages"