Charity style fixes.