diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index d44fcb4..c6a4baf 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7799,6 +7799,7 @@
 free_cd_dir()
 {
     vim_free(prev_dir);
+    prev_dir = NULL;
 }
 #endif
 
@@ -9521,6 +9522,7 @@
 		    *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
 		    return NULL;
 		}
+		result = shorten_fname1(result);
 		break;
 
 	case SPEC_ABUF:		/* buffer number for autocommand */