diff --git a/Makefile b/Makefile
index dbac9cabd..c88331d39 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,12 @@ DEFAULT_PLATFORM = pc86
 
 ACK_TEMP_DIR = /tmp
 
-# Where is the ACK going to be installed, eventually?
+# Where is the ACK going to be installed, eventually? If you don't want to
+# install it and just want to run the ACK from the build directory
+# (/tmp/ack-build/staging, by default), leave this as $(INSDIR).
 
-PREFIX = /usr/local
+#PREFIX = /usr/local
+PREFIX = $(INSDIR)
 
 # Where do you want to put the object files used when building?
 
diff --git a/lang/cem/cemcom.ansi/input.c b/lang/cem/cemcom.ansi/input.c
index fc1e99f28..2b652b64f 100644
--- a/lang/cem/cemcom.ansi/input.c
+++ b/lang/cem/cemcom.ansi/input.c
@@ -82,10 +82,9 @@ AtEoIF()
 	}
 	IncludeLevel--;
 #endif
-	if (WorkingDir[0] != '\0') free(WorkingDir);
+	/* We don't free WorkingDir and FileName here because the rest of the
+	 * compiler may be holding pointers to them for displaying error messages.
+	 */
 #endif /* NOPP */
-#ifndef LINT
-	if (FileName != source) free(FileName);
-#endif
 	return 0;
 }