BCM: Misc improvements