DOI fixes, ARO navigation warning fixes