BB: Fixes after integration 1