More fixes for workspace dependency loading