Correct errors introduced while "cleaning"