diff --git a/event/lib/event.c b/event/lib/event.c
index 61b2a662eb8ca729aab414bdcb71cba41a9e9b72..6989e7060d9242692df210cb6a36a4050b54ca8a 100644
--- a/event/lib/event.c
+++ b/event/lib/event.c
@@ -1,6 +1,6 @@
 /*
  * EMULAB-COPYRIGHT
- * Copyright (c) 2000-2003 University of Utah and the Flux Group.
+ * Copyright (c) 2000-2004 University of Utah and the Flux Group.
  * All rights reserved.
  */
 
@@ -23,10 +23,13 @@
 #include <time.h>
 #include "event.h"
 
-#define ERROR(fmt,...) fprintf(stderr,__FUNCTION__ ": " fmt, ## __VA_ARGS__)
-#define INFO(fmt,...) fprintf(stderr,__FUNCTION__ ": " fmt, ## __VA_ARGS__)
+#define ERROR(fmt,...) \
+ { fputs(__FUNCTION__,stderr); fprintf(stderr,": " fmt, ## __VA_ARGS__); }
+#define INFO(fmt,...) \
+ { fputs(__FUNCTION__,stderr); fprintf(stderr,": " fmt, ## __VA_ARGS__); }
 #ifdef  DEBUG
-#define TRACE(fmt,...) frintf(stderr,__FUNCTION__ ": " fmt, ## __VA_ARGS__)
+#define TRACE(fmt,...) \
+ { fputs(__FUNCTION__,stderr); fprintf(stderr,": " fmt, ## __VA_ARGS__); }
 #else
 #define TRACE(fmt,...)
 #endif
diff --git a/event/proxy/proxyserver.c b/event/proxy/proxyserver.c
index 7fd5898c2e7be1e5e81d12d71d167febc94deaf8..6d393797349906c0029d1fcc17e422032ff338b6 100644
--- a/event/proxy/proxyserver.c
+++ b/event/proxy/proxyserver.c
@@ -1,6 +1,6 @@
 /*
  * EMULAB-COPYRIGHT
- * Copyright (c) 2003 University of Utah and the Flux Group.
+ * Copyright (c) 2003, 2004 University of Utah and the Flux Group.
  * All rights reserved.
  */
 
@@ -382,6 +382,7 @@ ServerLoop(void)
 			client_records   = crecord;
 			info("Connected: %s\n", inet_ntoa(client.sin_addr));
 		next:
+			;
 		}
 
 		/*
diff --git a/event/tbgen/tevc.c b/event/tbgen/tevc.c
index 12af249e73c78e2680f541af99b2fb7614d73adb..faf80b018c3ccb0027c11b5cf3786f950959e2de 100644
--- a/event/tbgen/tevc.c
+++ b/event/tbgen/tevc.c
@@ -1,6 +1,6 @@
 /*
  * EMULAB-COPYRIGHT
- * Copyright (c) 2000-2003 University of Utah and the Flux Group.
+ * Copyright (c) 2000-2004 University of Utah and the Flux Group.
  * All rights reserved.
  */
 
@@ -305,7 +305,7 @@ main(int argc, char **argv)
 			format += strlen(format) - len;
 
 			gettimeofday(&when, NULL);
-			localtime_r(&when.tv_sec, &tm);
+			localtime_r((time_t *)&when.tv_sec, &tm);
 			if (!strptime(evtime, format, &tm))
 				usage(progname);
 
diff --git a/sensors/slothd/slothd.h b/sensors/slothd/slothd.h
index 83ece2a23513d2384e70e42cc9bbd5df2c7643eb..eb3fbf12b5b051979d4851d62dc39e5f0825d8f0 100644
--- a/sensors/slothd/slothd.h
+++ b/sensors/slothd/slothd.h
@@ -30,7 +30,6 @@
 #include <netdb.h>
 #include <signal.h>
 #include <syslog.h>
-#include <varargs.h>
 #include <utmp.h>
 #ifdef __linux__
 #include <net/if.h>