Changes for explicit bucket name override for Heroku