Fixing heroku issues