Fix Heroku production problems