Fixed dependency loading