Various OpenShift compatibility fixes