More fixes for Heroku deploy.