diff --git a/lib/buffer.c b/lib/buffer.c
index b689549ed6..ee9310100e 100644
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -148,7 +148,7 @@ buffer_add (struct buffer *b)
 {
   struct buffer_data *d;
 
-  d = XMALLOC(MTYPE_BUFFER_DATA, offsetof(struct buffer_data, data[b->size]));
+  d = XMALLOC(MTYPE_BUFFER_DATA, offsetof(struct buffer_data, data) + b->size);
   d->cp = d->sp = 0;
   d->next = NULL;
 
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 1d40ab4cca..667c88e576 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -231,9 +231,12 @@ static void log_it(const char *line)
 {
   time_t t = time(NULL);
   struct tm *tmp = localtime(&t);
-  const char *user = getenv("USER") ? : "boot";
+  const char *user = getenv("USER");
   char tod[64];
 
+  if (!user)
+    user = "boot";
+
   strftime(tod, sizeof tod, "%Y%m%d-%H:%M.%S", tmp);
   
   fprintf(logfile, "%s:%s %s\n", tod, user, line);