Fixing heroku errors (6)