Solving redo!, undo! persistence errors