Changes for heroku support