Fix regressions introduced by new dependency updates
Add shrinkwrap