Some minor fixez of messages