Note about AOI fixes