More fixing for Heroku