Fixed up a few inconsistencies that weren't meant to be committed which subsequently broke AI.