chg: missing stuff from master