Fixed post-Heroku errors