Few BOM-related changes