Tweak dependencies
Merge branch 'fix-dev-dependencies'