diff --git a/orte/orted/orted_comm.c b/orte/orted/orted_comm.c
index 35e75e56af..364db1bb76 100644
--- a/orte/orted/orted_comm.c
+++ b/orte/orted/orted_comm.c
@@ -15,6 +15,8 @@
  * Copyright (c) 2009      Sun Microsystems, Inc. All rights reserved.
  * Copyright (c) 2010-2011 Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -1145,6 +1147,9 @@ void orte_daemon_recv(int status, orte_process_name_t* sender,
                 OBJ_RELEASE(relay_msg);
             }
         }
+        if (NULL != gstack_exec) {
+            free(gstack_exec);
+        }
         /* always send our response */
         if (0 > (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, answer,
                                                ORTE_RML_TAG_STACK_TRACE,
diff --git a/orte/orted/orted_submit.c b/orte/orted/orted_submit.c
index f3fa426db8..44d6bcdb2c 100644
--- a/orte/orted/orted_submit.c
+++ b/orte/orted/orted_submit.c
@@ -15,7 +15,7 @@
  * Copyright (c) 2007-2016 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -1291,7 +1291,7 @@ static int create_app(int argc, char* argv[],
     char *param, *value;
     orte_app_context_t *app = NULL;
     bool found = false;
-    char *appname;
+    char *appname = NULL;
 
     *made_app = false;
 
@@ -1704,7 +1704,6 @@ static int create_app(int argc, char* argv[],
             free(value);
         }
     }
-    free(appname);
 
     *app_ptr = app;
     app = NULL;
@@ -1716,6 +1715,9 @@ static int create_app(int argc, char* argv[],
     if (NULL != app) {
         OBJ_RELEASE(app);
     }
+    if (NULL != appname) {
+        free(appname);
+    }
     return rc;
 }