more upstream API changes