diff --git a/ush/build.sh b/ush/build.sh
index f0cab6ffe5..9a280c4e55 100755
--- a/ush/build.sh
+++ b/ush/build.sh
@@ -29,7 +29,7 @@ module list
 set -x
 
 # Set CONTROLPATH variable to user develop installation
-CONTROLPATH="$DIR_ROOT/install/bin"
+CONTROLPATH="$DIR_ROOT/../develop/install/bin"
 # Collect BUILD Options
 CMAKE_OPTS+=" -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
 
diff --git a/ush/sub_hercules b/ush/sub_hercules
index de5a415603..3466c5a79d 100755
--- a/ush/sub_hercules
+++ b/ush/sub_hercules
@@ -165,6 +165,6 @@ if [[ -w $SUBLOG ]];then
   jobn=$(grep -i submitted $ofile|head -n1|cut -d\" -f2)
   date -u +"%Y%m%d%H%M%S : $subcmd : $jobn" >>$SUBLOG
 fi
-#rm $cfile $ofile
-#[[ $MKDATA = YES ]] && rmdir $DATA
+rm $cfile $ofile
+[[ $MKDATA = YES ]] && rmdir $DATA
 exit $rc
diff --git a/ush/sub_orion b/ush/sub_orion
index 1bcce5cc4f..e5844474db 100755
--- a/ush/sub_orion
+++ b/ush/sub_orion
@@ -87,6 +87,7 @@ export jobname=${jobname:-$bn}
 output=${output:-$jobname.out}
 myuser=$LOGNAME
 myhost=$(hostname)
+exp=${jobname}
 
 DATA=${ptmp:-/work/noaa/da/stmp/$LOGNAME/tmp}
 mkdir -p $DATA
@@ -108,6 +109,7 @@ echo ""
 echo "#SBATCH --output=$output"                                                    >> $cfile
 echo "#SBATCH --job-name=$jobname"                                                 >> $cfile
 echo "#SBATCH --qos=$queue"                                                        >> $cfile
+echo "#SBATCH --partition=$partition"                                              >> $cfile
 echo "#SBATCH --time=$timew"                                                       >> $cfile
 echo "#SBATCH --nodes=$nodes --ntasks-per-node=$procs --cpus-per-task=$threads"    >> $cfile
 echo "#SBATCH --account=$accnt"                                                    >> $cfile