More Heroku Fixes