diff --git a/orte/mca/filem/rsh/filem_rsh_component.c b/orte/mca/filem/rsh/filem_rsh_component.c
index 3133dc11e2..1773f1c5b2 100644
--- a/orte/mca/filem/rsh/filem_rsh_component.c
+++ b/orte/mca/filem/rsh/filem_rsh_component.c
@@ -113,13 +113,13 @@ static int filem_rsh_open(void)
                               "rcp",
                               "The rsh cp command for the FILEM rsh component",
                               false, false,
-                              "rcp",
+                              "scp",
                               &mca_filem_rsh_component.cp_command);
     mca_base_param_reg_string(&mca_filem_rsh_component.super.filem_version,
                               "rsh",
                               "The remote shell command for the FILEM rsh component",
                               false, false,
-                              "rsh",
+                              "ssh",
                               &mca_filem_rsh_component.remote_sh_command);
 
     mca_base_param_reg_int(&mca_filem_rsh_component.super.filem_version,
diff --git a/orte/mca/snapc/base/snapc_base_open.c b/orte/mca/snapc/base/snapc_base_open.c
index 32de48b312..dcfa6ef3ce 100644
--- a/orte/mca/snapc/base/snapc_base_open.c
+++ b/orte/mca/snapc/base/snapc_base_open.c
@@ -54,6 +54,7 @@ int orte_snapc_base_open(void)
 {
     int value;
     char * str_value = NULL;
+    char * home = NULL;
 
     /* Debugging/Verbose output */
     mca_base_param_reg_int_name("snapc",
@@ -68,14 +69,20 @@ int orte_snapc_base_open(void)
     }
     opal_output_set_verbosity(orte_snapc_base_output, value);
 
+    /* We may need this later */
+#if !defined(__WINDOWS__)
+    home = getenv("HOME");
+#else
+    home = getenv("USERPROFILE");
+#endif  /* !defined(__WINDOWS__) */
+
     /* Global Snapshot directory */
     mca_base_param_reg_string_name("snapc",
                                    "base_global_snapshot_dir",
                                    "The base directory to use when storing global snapshots",
                                    false, false,
-                                   strdup("/tmp"),
+                                   home,
                                    &orte_snapc_base_global_snapshot_dir);
-
     /*
      * Store the checkpoint files in their final location.
      * This assumes that the storage place is on a shared file