Additional updates for Play 2.1