openshift fixes