more fixes to BnB