Fix flaws.