Misc cleanup round.