BS: more fixes