More AI fixes. You know the drill.