More map fixes

Fixes some areas