fixes from BS