More adjustments for heroku