Additions to help it run on bluemix