Fixing the message parser and dumper