Openshift compatiblity fixes