More Fixing
Heroku issues