Small fixes
Upgrade to Play 2.2.x