Fixes several minor b3 issues discussed today