Various cleanings up.