Couple of changes to maintain compatibility with current OpenShift