afm-run: minor fixes