Some modifications for heroku