build chain fixes