Still fixing heroku issues