refactor(bs3): fixes