Adjustments to build in BBNC
Adjustments to build in BBNC