Backport dependencies fixes

This needs back-ported and released with 2.0.6