BB bug fixes for 1%