Fixes some issues with heroku