BS: additional tweaks