Fix a couple of issues with compilation on Heroku.