Fixed Bill of Material Issues