Fixes to defects regarding BA