bs3 support fixes