Fix to use standard bbs as much as possible
Some fixes