More undo/redo fixes...