Brian's map fixes