BBS: Some fixes.