Implement some missing changes in the latest API bump.