BS: fixes