Attempting to fix Heroku issues