Fixup for upstream API changes