Fixes to undo history entries...