Changes to work with 2.2.5.