Tweak some redo logic