More fixes to BOM