A couple misc map fixes