Fix some heroku bugs