--- a/apps/dtnrespond/dtnrespond.c	Fri Jan 06 17:28:36 2012 +0000
+++ b/apps/dtnrespond/dtnrespond.c	Tue Jan 10 12:57:26 2012 +0000
@@ -212,7 +212,7 @@
     }
 
     // if no reply-to eid set, use the local eid
-    if (reply_eid_name == NULL)
+    if (*reply_eid_name == 0)
         strncpy(reply_eid_name, local_eid_name, PATH_MAX);
 
     return DTN_SUCCESS;

--- a/servlib/bundling/BPQCache.h	Fri Jan 06 17:28:36 2012 +0000
+++ b/servlib/bundling/BPQCache.h	Tue Jan 10 12:57:26 2012 +0000
@@ -26,7 +26,7 @@
 #include <oasys/util/StringUtils.h>
 #include "../reg/Registration.h"
 #include "../reg/RegistrationTable.h"
-#include <list>
+
 
 namespace dtn {
 

--- a/servlib/bundling/BundleDaemon.cc	Fri Jan 06 17:28:36 2012 +0000
+++ b/servlib/bundling/BundleDaemon.cc	Tue Jan 10 12:57:26 2012 +0000
@@ -879,7 +879,7 @@
      */
     Bundle* duplicate = find_duplicate(bundle);
     if (duplicate != NULL) {
-        log_notice("got duplicate bundle: %s -> %s creation %llu.%llu frag_offset %llu",
+        log_notice("got duplicate bundle: %s -> %s creation %llu.%llu frag_offset %u",
                    bundle->source().c_str(),
                    bundle->dest().c_str(),
                    bundle->creation_ts().seconds_,

--- a/servlib/cmd/BPQCommand.cc	Fri Jan 06 17:28:36 2012 +0000
+++ b/servlib/cmd/BPQCommand.cc	Tue Jan 10 12:57:26 2012 +0000
@@ -41,11 +41,16 @@
     }
     const char* op = argv[1];
 
-    if (strncmp(op, "enabled", strlen("enabled")) == 0) {
+    if (strncmp(op, "enable", strlen("enable")) == 0) {
 
 		BundleDaemon::instance()->bpq_cache()->cache_enabled_ = true;
 		return TCL_OK;
 
+    } else if(strncmp(op, "disable", strlen("disable")) == 0) {
+
+    	BundleDaemon::instance()->bpq_cache()->cache_enabled_ = false;
+		return TCL_OK;
+
     } else if(strncmp(op, "cache_size", strlen("cache_size")) == 0) {
         if (argc < 3) {
             wrong_num_args(argc, argv, 2, 3, INT_MAX);