B2 Fixes

fix #1335
fix #1336