Bug fix from AEAD refactoring for some systems.