bs3 + fa4 fixes