Dependency fixes
These are the fixes to the dependencies that I did as part of !10 (closed), these weren't failing before because the dependencies were available in the base system.
These are the fixes to the dependencies that I did as part of !10 (closed), these weren't failing before because the dependencies were available in the base system.