#7443 - EAD...?

Some EAD fixes.