Yet more BoM tweaks.