Update as required by recent API changes