Fixed up a few remaining areas where AOIs were incorrectly referenced.