Assorted updates to dev dependencies
Sync with upstream