Proper dependencies for BB2, fixes #31