tweaks to work with updated dependencies