Fixed BB errors