more fixes for BBB.  I think I'm done