Adjust to upstream API changes