Heroku issues fixed