Minor fixes for the message parser.