another round of changes to accommodate recent developments in third party dependencies