Partial update of Ecl build.