More heroku specific fixes