Fixed bugs exposed by play framework tests introduced with ADA compliance changes