BB: Final adjustments