Some fix for openshift