Fixes for BB