Minor fixes for MO19

Map merger is being kind of dumb and I'm not sure what I did wrong there.
More minor fixes without map merger bleh
Merge pull request #4945 from WJohn/moreMO19fixes

Minor fixes for MO19