Minor fixes in messages