More fixes to AI
More fixes to AI