Fix EPV reported errors.