diff --git a/runtime/src/chpl-launcher-common.c b/runtime/src/chpl-launcher-common.c
index d31d4b89b04e..c5abe13877ba 100644
--- a/runtime/src/chpl-launcher-common.c
+++ b/runtime/src/chpl-launcher-common.c
@@ -546,7 +546,7 @@ char* chpl_get_enviro_keys(char sep)
     int keyLen = strstr(environ[i], "=") - environ[i];
 
     // if the key ends with _modshare, skip it
-    if (keyLen > 8 && strncmp(environ[i] + keyLen - 8, "_modshare", 9) == 0) {
+    if (keyLen > 8 && strncmp(environ[i] + keyLen - 9, "_modshare", 9) == 0) {
       continue;
     }
     numVars++;
@@ -563,7 +563,7 @@ char* chpl_get_enviro_keys(char sep)
 
     int keyLen = strstr(environ[i], "=") - environ[i];
     // skip keys that end with _modshare
-    if (keyLen > 8 && strncmp(environ[i] + keyLen - 8, "_modshare", 9) == 0) {
+    if (keyLen > 8 && strncmp(environ[i] + keyLen - 9, "_modshare", 9) == 0) {
       continue;
     }
     strncpy(buffer + bufferOffset, environ[i], keyLen);
diff --git a/util/test/chpl_launchcmd.py b/util/test/chpl_launchcmd.py
index 79338f14755c..c9963ec06824 100755
--- a/util/test/chpl_launchcmd.py
+++ b/util/test/chpl_launchcmd.py
@@ -57,10 +57,8 @@ def main():
     """Run the program!"""
     job = AbstractJob.init_from_environment()
     (stdout, stderr) = job.run()
-    logging.debug("I am after run {} {} {} {}", stdout, type(stdout), stderr, type(stderr))
     sys.stdout.buffer.write(stdout)
     sys.stderr.buffer.write(stderr)
-    logging.debug("I am after buffer writes")
 
 
 class AbstractJob(object):
@@ -403,8 +401,6 @@ def job_status(job_id, output_file):
 
             logging.info('The test finished with output of length {0}.'.format(len(output)))
 
-        logging.debug('Returning output and error from job.')
-
         return (output, error)
 
     def submit_job(self, testing_dir, output_file, error_file, input_file):
@@ -1149,7 +1145,7 @@ def _temp_dir(dir_prefix='chapel-test-tmp'):
         yield tmp_dir
     finally:
         logging.debug('Deleting temporary working directory at: {0}'.format(tmp_dir))
-        # shutil.rmtree(tmp_dir)
+        shutil.rmtree(tmp_dir)
 
 
 if __name__ == '__main__':