Small BS3 fixes.