More fixes for deployment to heroku