Attempt to fix heroku issues