Fix a few cleanings.