Misc: Make sure it can run on Heroku