fix devhub regressions (bugs 847326, 847296)

Fixes a couple of regressions from changes or missing deps following 82f65dc