Map fixes - mostly disposals
Merge pull request #198 from alex-gh/disposal_fixes

Map fixes - mostly disposals