Fixed a lot more BB bugs