Some changes to work on Heroku