diff --git a/src/fe/startup/parse_launcher.cc b/src/fe/startup/parse_launcher.cc
index 9edb3f23..83dd08ce 100644
--- a/src/fe/startup/parse_launcher.cc
+++ b/src/fe/startup/parse_launcher.cc
@@ -291,12 +291,7 @@ int ModifyArgv::modifyCmdLine()
    char options_str[32];
    snprintf(options_str, 32, "%lu", (unsigned long) params->opts);
    string options(options_str);
-   
-   int rc = getFirstValidPath( params->commpaths, &( params->commpath ), params->number );
-   if( rc != 0 ){
-       return -1;
-   }
-   string commpath(params->commpath);
+   int rc;
    
    char number_str[32];
    snprintf(number_str, 32, "%lu", (unsigned long) params->number);
@@ -323,7 +318,7 @@ int ModifyArgv::modifyCmdLine()
       if (p == parser->appExecutableAt()) {
 #if defined(os_bluegene)
          string bg_env_str = parser->getParser()->getBGString();
-         parser->getParser()->addBGEnvStr(n, new_argv, bg_env_str, default_libstr, intercept_libstr, commpath, number, options, shmcache_size);
+         parser->getParser()->addBGEnvStr(n, new_argv, bg_env_str, default_libstr, intercept_libstr, params->commpaths, number, options, shmcache_size);
 #else
          char **a_argv;
          int a_argc;
diff --git a/src/server/auditserver/ldcs_audit_server_filemngt.c b/src/server/auditserver/ldcs_audit_server_filemngt.c
index eaf3995c..db2d163b 100644
--- a/src/server/auditserver/ldcs_audit_server_filemngt.c
+++ b/src/server/auditserver/ldcs_audit_server_filemngt.c
@@ -59,6 +59,7 @@ static char *filemngt_normalize_dir(char *dir) {
 int ldcs_audit_server_filemngt_init (char *cachepath, char *commpath) {
    int rc=0;
 
+   debug_printf2("Setting cachepath to '%s' and commpath to '%s'\n", cachepath, commpath);
    _ldcs_audit_server_cachepath = cachepath;
    _ldcs_audit_server_commpath  = commpath;
    if (-1 == spindle_mkdir(_ldcs_audit_server_cachepath)) {
diff --git a/src/utils/parseloc.c b/src/utils/parseloc.c
index 0c994e86..eaf6490d 100644
--- a/src/utils/parseloc.c
+++ b/src/utils/parseloc.c
@@ -366,7 +366,7 @@ static int validateCandidatePath( char *candidatePath, char **realizedPath, char
     if( parsedCandidatePath ){
        realizedCandidatePath = realize( parsedCandidatePath );
        if( realizedCandidatePath ){
-           rc = spindle_mkdir( parsedCandidatePath );
+           rc = spindle_mkdir( realizedCandidatePath );
            if( 0 == rc ){
                // candidatePath is going to be freed in the calling function.
                //   symbolicPath needs a strdup().  parsedPath() and realizedPath()
diff --git a/src/utils/spindle_mkdir.c b/src/utils/spindle_mkdir.c
index cd36e9d6..b820482b 100644
--- a/src/utils/spindle_mkdir.c
+++ b/src/utils/spindle_mkdir.c
@@ -142,10 +142,10 @@ int spindle_mkdir(char *orig_path)
          }
          else {
             debug_printf3("Did a mkdir(%s)\n", path);
+         }
 #if defined(TRACK_MKDIR)
-            track_mkdir(path);
+         track_mkdir(path);
 #endif            
-         }
       }
       path[i] = orig_char;
 
@@ -160,6 +160,9 @@ int spindle_mkdir(char *orig_path)
       if (checkdir(path) == -1) {
          return -1;
       }
+#if defined(TRACK_MKDIR)
+      track_mkdir(path);
+#endif            
    }
    return 0;
 }