code changes to work well with openshift and local machine