Fix minor bugs, everything is broken on heroku