Fixup qualifier save