Fix more BBS bugs