Heroku deployment fixes