Fixes to the BOM.