Fixing heroku bugs