owner map fixes