Few tweaks pre Heroku