Fixing broken deps - result of new dependency generator?