ovm map fixes