Changes for compatibility with OpenShift