Completed map fixes