Full dependency chain build fix