Some recent upstream API changes