Changes to work on openshift