Fixed OpenShift bugs