More heroku fixes