Changes to work with heroku