Minor adl cleanup