Index: branches/cleanup/ippTools/src/stacktoolConfig.c
===================================================================
--- branches/cleanup/ippTools/src/stacktoolConfig.c	(revision 18153)
+++ branches/cleanup/ippTools/src/stacktoolConfig.c	(revision 18357)
@@ -111,7 +111,7 @@
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id",  0,
             "define tessellation ID (required)", NULL);
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-warp_id",
+    psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-warp_id",
              PS_META_DUPLICATE_OK,
-             "include this warp ID (multiple OK, required)", NULL);
+             "include this warp ID (multiple OK, required)", 0);
 
     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,
@@ -120,6 +120,6 @@
     // -updaterun
     psMetadata *updaterunArgs = psMetadataAlloc();
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-stack_id", 0,
-            "define stack ID (required)", NULL);
+    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "define stack ID (required)", 0);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
             "set state (required)", NULL);
@@ -133,15 +133,15 @@
     // -addinputskyfile
     psMetadata *addinputskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
-            "define stack ID (required)", NULL);
-    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "define warp ID (required)", NULL);
+    psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "define stack ID (required)", 0);
+    psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "define warp ID (required)", 0);
 
     // -inputskyfile
     psMetadata *inputskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
-            "search by stack ID", NULL);
-    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warp ID", NULL);
+    psMetadataAddS64(inputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "search by stack ID", 0);
+    psMetadataAddS64(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID", 0);
     psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -151,8 +151,8 @@
     // -tosum
     psMetadata *tosumArgs = psMetadataAlloc();
-    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-stack_id", 0,
-            "search by stack ID", NULL);
-    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warp ID", NULL);
+    psMetadataAddS64(tosumArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "search by stack ID", 0);
+    psMetadataAddS64(tosumArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID", 0);
     psMetadataAddU64(tosumArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -162,6 +162,6 @@
     // -addsumskyfile
     psMetadata *addsumskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
-            "define stack ID (required)", NULL);
+    psMetadataAddS64(addsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "define stack ID (required)", 0);
     psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-uri", 0,
             "define URI of file", 0);
@@ -183,8 +183,8 @@
     // -sumskyfile
     psMetadata *sumskyfileArgs= psMetadataAlloc();
-    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
-            "search by stack ID", NULL);
-    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
-            "search by warp ID", NULL);
+    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "search by stack ID", 0);
+    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID", 0);
     psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -194,6 +194,6 @@
     // -revertsumskyfile
     psMetadata *revertsumskyfileArgs= psMetadataAlloc();
-    psMetadataAddStr(revertsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
-            "search by stack ID (required)", NULL);
+    psMetadataAddS64(revertsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "search by stack ID (required)", 0);
     psMetadataAddS16(revertsumskyfileArgs, PS_LIST_TAIL, "-code",  0,
             "search by fault code", 0);
@@ -305,5 +305,5 @@
     // do this last so we don't setup a connection before CLI options are
     // validated
-    config->dbh = pmConfigDB(config->modules);
+    config->dbh = psMemIncrRefCounter(pmConfigDB(config->modules));
     if (!config->dbh) {
         psError(PS_ERR_UNKNOWN, false, "Can't configure database");