small ag fixes