Bluemix Fixes