Some changes required by Play 2.2.x and Heroku