More of Brian's map fixes