Changes to comply with the 2.2.0 branch of Quail