Minor fixes after review to mopak parser.