minor bb fixes