Assorted CB Fixes / Tweaks [consistency-focused]