OpenShift fixes