OpenShift bug fixes