Changes for OpenShift compatibility.