Update to API changes in 6.6