More tweaks for bs3