Re-apply my map fixes