Minor adjustments to BOM