Fix errors pointed by EPV.