diff --git a/projects/rocprofiler/bin/rpl_run.sh b/projects/rocprofiler/bin/rpl_run.sh
index 211343d955..6f5f9ecd3b 100755
--- a/projects/rocprofiler/bin/rpl_run.sh
+++ b/projects/rocprofiler/bin/rpl_run.sh
@@ -378,7 +378,14 @@ else
   csv_output=$RUN_DIR/${input_base}.csv
 fi
 
-APP_CMD=$*
+APP_CMD=""
+for i in `seq 1 $#`; do
+  if [ -n "$APP_CMD" ] ; then
+    APP_CMD=$APP_CMD" "
+  fi
+  eval "arg=\${$i}"
+  APP_CMD=$APP_CMD\"$arg\"
+done
 
 echo "RPL: profiling '$APP_CMD'"
 echo "RPL: input file '$INPUT_FILE'"
diff --git a/projects/rocprofiler/bin/tblextr.py b/projects/rocprofiler/bin/tblextr.py
index ebcd83df00..3e37b67098 100755
--- a/projects/rocprofiler/bin/tblextr.py
+++ b/projects/rocprofiler/bin/tblextr.py
@@ -332,7 +332,8 @@ if (len(sys.argv) < 2): fatal("Usage: " + sys.argv[0] + " <output CSV file> <inp
 outfile = sys.argv[1]
 infiles = sys.argv[2:]
 indir = re.sub(r'\/[^\/]*$', r'', infiles[0])
-inext = re.sub(r'^[^\.]*', r'', infiles[0])
+inext = re.sub(r'\s+$', r'', infiles[0])
+inext = re.sub(r'^.*(\.[^\.]+)$', r'\1', inext)
 
 dbfile = ''
 csvfile = ''