diff --git a/APIG/client/commander.cpp b/APIG/client/commander.cpp
index dd91a6e..4faab45 100644
--- a/APIG/client/commander.cpp
+++ b/APIG/client/commander.cpp
@@ -237,6 +237,8 @@ void mdCommander::driver() {
             thisConfig->terminateRequest = true;
             sprintf(work,"kill -9 %d",thisConfig->daemonProcess);
             system(work);
+            sprintf(work,"rm /dev/shm/ausreg-cd-global");
+            system(work);
             goto done;
         }
         continue;
diff --git a/AusRegCliever/Makefile b/AusRegCliever/Makefile
index 456dc3a..bb4976b 100644
--- a/AusRegCliever/Makefile
+++ b/AusRegCliever/Makefile
@@ -1,6 +1,6 @@
-#LOCATION=DEBIAN_7
+LOCATION=DEBIAN_7
 ARTKENABLED=132
-LOCATION=DEBIAN_6
+#LOCATION=DEBIAN_6
 #LOCATION=OSX_10_8
 #
 # Add other locations and move target differences into the macros as needed,
@@ -25,12 +25,12 @@ ifeq ($(LOCATION),DEBIAN_6)
  ARTKLIB=-L/home/jdaugherty/dnseppus/ACTK1_0/lib
  ARTKINCL=-I/home/jdaugherty/dnseppus/ACTK1_0
 endif
+
 ifeq ($(LOCATION),OSX_10_8)
  ARTKLIB=-L/Users/juand/dnseppus/ACTK1_0/lib
  ARTKINCL=-I/Users/juand/dnseppus/ACTK1_0
 endif
 
-
 ifeq ($(LOCATION),DEBIAN_7)
 ifneq ($(ARTKENABLED),0)
 XALAN_LIB_DIR = /usr/local/lib
@@ -41,6 +41,7 @@ XERCES_LIB = xerces-c
 XERCES_INC_DIR = /usr/local/include/xercesc/
 endif
 endif
+
 ifeq ($(LOCATION),DEBIAN_6)
 XALAN_LIB_DIR = /usr/lib/
 XALAN_LIB = xalan-c
@@ -49,6 +50,7 @@ XERCES_LIB_DIR = /usr/lib/
 XERCES_LIB = xerces-c
 XERCES_INC_DIR = /usr/include/xercesc/
 endif
+
 ifeq ($(LOCATION),OSX_10_8)
 XALAN_LIB_DIR = /opt/local/lib/
 XALAN_LIB = xalan-c
diff --git a/AusRegCliever/server/cliever-md.cpp b/AusRegCliever/server/cliever-md.cpp
index c296dfb..2f20acb 100644
--- a/AusRegCliever/server/cliever-md.cpp
+++ b/AusRegCliever/server/cliever-md.cpp
@@ -111,7 +111,7 @@ main(int           const argc,
 
     mdOrAC      = (strcspn(argv[0],"./") == strlen(argv[0])) ? argv[0] : strrchr(argv[0],'/') + 1;
     mdHasEPPTk  = strstr(argv[0],"ausreg-md") ? false : true;
-
+    thisConfig->tkScenario = 1;
 
     if (argc < 3 || argc > 7) usage();
 
@@ -147,7 +147,7 @@ main(int           const argc,
       }
       else
       if (!strncmp(argv[mthParm],"tk=",2)) {
-    	  c = (char *)&argv[mthParm][3];
+    	  c = (char *)argv[mthParm]+3;
     	  thisConfig->tkScenario = atoi(c);
       }
       else
diff --git a/AusRegCliever/server/masterDaemon.cpp b/AusRegCliever/server/masterDaemon.cpp
index cd3b7f1..288799c 100644
--- a/AusRegCliever/server/masterDaemon.cpp
+++ b/AusRegCliever/server/masterDaemon.cpp
@@ -132,8 +132,8 @@ int masterDaemon::initAusRegTK(void) {
 
     try {
 
-      theseLogs->logN(0,"Attaching AusRegistry EPP Toolkit 1.3.2 at tkScenario %d.",
-    		          thisConfig->tkScenario);
+      theseLogs->logN(2,"Attaching AusRegistry EPP Toolkit %d at tkScenario %d.",
+    		          ARTKENABLED, thisConfig->tkScenario);
 
       artk = new ausRegEPPTK();
       if (!artk->doNothing(cfg)) {