Couple of quick changes to see if we can make it run on Heroku