fixes for bluemix issue