Fix hbs for bb_components