More Play 2.1 changes.