A few changes so I can test this on Heroku.