More map fixes.