Fix flaws pointed by EPV.