More map fixes...