Random fixes/prettying up
Making more openshift friendly