some fixes in messages