FIX edp issues

ISSUE=IGNORE
TASK=IGNORE
LBID=IGNORE
Merge pull request #60 from leeight/fix-edp

FIX edp issues