ba small fixes