Fixed bugs caused by OpenShift experimentation