Map fixes.
Map fixes to fix the map fixes...
I'm giving up on writing proper ciommits.
Merge branch 'master' of https://github.com/mattseymour/envhack