Fixed Heroku setup