some changes to support errata work