Fix errors in Heroku