Fix up various items lost in the SHA2v2 undo.