diff -ruN cfengine-2.0.5-old/src/cfagent.c cfengine-2.0.5/src/cfagent.c
--- cfengine-2.0.5-old/src/cfagent.c	2003-02-11 20:36:53.000000000 +0000
+++ cfengine-2.0.5/src/cfagent.c	2003-02-17 16:26:50.000000000 +0000
@@ -107,12 +107,13 @@
 	 SetStrategies(); 
 	 DoTree(1,"Update");
 	 EmptyActionSequence();
-	 DeleteMacros();
 	 DeleteClassesFromContext("update");
 	 }
       }
    }
 
+DeleteMacros();
+
 if (UPDATEONLY)
    {
    return 0;
@@ -550,7 +551,7 @@
 
  if (!GetMacroValue("env_time"))
     {
-    snprintf(env,maxvarsize-1,"%s",ctime(&statbuf.st_mtime));
+    snprintf(value,maxvarsize-1,"%s",ctime(&statbuf.st_mtime));
     AddMacroValue("env_time",value);
     }
  else