chg: some missing parts of Adi's commit