Fix some of the undo struggles