Minor fixes to run well with Openshift