Fixes to undo/redo...