Fixes to bom