Fixed Heroku issues