Fix EPV reported issues