Final Fixes

Final updates and fixes with openshift