Fixup refactored persistence mode