Fixed a couple of messages according to CADMOS comments.