Added McArthur's final map fixes.