Fixes issues with heroku acting up