small fixes in messages module