BOM FIXES