Request Rob's map fixes