FIX edp issues

ISSUE=IGNORE
TASK=IGNORE
LBID=IGNORE