Even more undo/redo fixes...