EDS minor updates