Munge fixes

Two fixes to the munge pass