Fixing more openshift stuff