Trying to fix Heroku issues