A few more B2 fixes / tweaks