Fixed some errors introduced in the cleaning.