Beta Preparations

Fixes to BBS