Fix more flaws pointed by EPV.