Awkward interactions after updates

Other BALA AI issues: