Dependency loading fixes.