Fix small glitches
Fix BOM problem