some fixes for openshift