Undo of some accidental changes