misc BS3 tweaks