Changes to support v1.22 libraries