Check in some outstanding changes for the AOD scanner