Editor Undo: Fix some issues