diff --git a/oracle_funcs.ksh b/oracle_funcs.ksh
index 665e2a4..7043fa4 100755
--- a/oracle_funcs.ksh
+++ b/oracle_funcs.ksh
@@ -268,12 +268,22 @@ get_log_mv() {
       exit_with_error
     fi
   else
-  mvId=$(awk '{match($0, /ManagedVolume:::[a-z0-9-]*/); if (RSTART > 0) {id=substr($0, RSTART, RLENGTH); sub(/"$/, "", id); print id}}' /tmp/rbkresponse.$$)
-  numChannels=$(awk '{match($0, /"numChannels":[ ]*[0-9]+/); if (RSTART > 0) {val=substr($0, RSTART, RLENGTH); sub(/.*:[ ]*/, "", val); print val}}' /tmp/rbkresponse.$$)
+    mvId=$(awk '{match($0, /ManagedVolume:::[a-z0-9-]*/); if (RSTART > 0) {id=substr($0, RSTART, RLENGTH); sub(/"$/, "", id); print id}}' /tmp/rbkresponse.$$)
+    numChannels=$(awk '{match($0, /"numChannels":[ ]*[0-9]+/); if (RSTART > 0) {val=substr($0, RSTART, RLENGTH); sub(/.*:[ ]*/, "", val); print val}}' /tmp/rbkresponse.$$)
     logMvPresent=1
-	echo "INFO: Log volume ($mv_name) exists with $numChannels channels"
+    echo "INFO: Log volume ($mv_name) exists with $numChannels channels"
+  fi
+
+}
+
+set_oracle_env() {
+  ORACLE_HOME=$(awk -F: '$1 == "'$1'" {print $2}' /etc/oratab)
+  PATH=$PATH:$ORACLE_HOME/bin
+  ORACLE_SID=$1
+  if [ -z "$ORACLE_HOME" ]; then
+    echo "ERROR: SID $1 not found in /etc/oratab"
+    exit_with_error
   fi
-  
 }
 
 open_mv() {
@@ -308,5 +318,4 @@ cleanup() {
   echo "`$DATE` -$$-: EXITED $0 $@" >> $LOGFILE
 	rm -f /tmp/rbkresponse.$$
 	rm -f $PIDFILE
-}
-
+}
\ No newline at end of file
diff --git a/rman_db.ksh b/rman_db.ksh
index 4c7d5b5..367cafd 100755
--- a/rman_db.ksh
+++ b/rman_db.ksh
@@ -27,22 +27,13 @@ get_script_dir() {
 
 MYDIR=$(get_script_dir "$_SCRIPT_")
 
-export ORACLE_SID=$1
-
-# . $HOME/.profile
-. ~oracle/bin/setEnv.sh
-
-export ORAENV_ASK=NO
-export ORACLE_SID=$1
-
-. oraenv
-
-export ORAENV_ASK=YES
-
 . $MYDIR/rubrik.conf
 . $MYDIR/oracle_funcs.ksh
 
-#ORACLE_SID=$1
+set_oracle_env $1
+
+export NLS_DATE_FORMAT='mm-dd-yyyy hh24:mi:ss'
+export NLS_LANG=AMERICAN_AMERICA.AL32UTF8
 
 usage() {
 	echo "Usage: $0 <DBNAME>]" 1>&2
@@ -53,9 +44,6 @@ if [ -z "${ORACLE_SID}" ]; then
     usage
 fi
 
-export NLS_DATE_FORMAT='mm-dd-yyyy hh24:mi:ss'
-export NLS_LANG=AMERICAN_AMERICA.AL32UTF8
-
 MOUNTPOINT=$MOUNTPOINT_PREFIX/$ORACLE_SID/data
 
 mkdir -p $RMAN_LOG_DIR/$ORACLE_SID/
diff --git a/rman_logs.ksh b/rman_logs.ksh
index f399bd0..b97744b 100755
--- a/rman_logs.ksh
+++ b/rman_logs.ksh
@@ -26,21 +26,15 @@ get_script_dir() {
 }
 
 MYDIR=$(get_script_dir "$_SCRIPT_")
-export ORACLE_SID=$1
-
-#. $HOME/.profile
-. ~oracle/bin/setEnv.sh
-
-export ORAENV_ASK=NO
-export ORACLE_SID=$1
-
-. oraenv
-
-export ORAENV_ASK=YES
 
 . $MYDIR/rubrik.conf
 . $MYDIR/oracle_funcs.ksh
 
+set_oracle_env $1
+
+export NLS_DATE_FORMAT='mm-dd-yyyy hh24:mi:ss'
+export NLS_LANG=AMERICAN_AMERICA.AL32UTF8
+
 usage() {
 	echo "Usage: $0 <DBNAME>]" 1>&2
 	exit 1
@@ -50,21 +44,23 @@ if [ -z "${ORACLE_SID}" ]; then
     usage
 fi
 
-export NLS_DATE_FORMAT='mm-dd-yyyy hh24:mi:ss'
-export NLS_LANG=AMERICAN_AMERICA.AL32UTF8
-
 mkdir -p $RMAN_LOG_DIR/$ORACLE_SID/
 RMAN_LOG=$RMAN_LOG_DIR/$ORACLE_SID/rman_${ORACLE_SID}_LOG_$(date +%d%m%y).log
 
 get_log_mv
 open_mv
 
+if [ -z "$numChannels" ]; then
+    echo "WARNING: numChannels not found, setting to 1"
+    numChannels=1
+fi
+
 if [ $? -ne 0 ]; then
     echo ERROR: Unable to open MV, aborting
     exit_with_error
 fi
 
-MOUNTPOINT=$MOUNTPOINT_PREFIX/$ORACLE_SID/logs
+MOUNTPOINT=$MOUNTPOINT_PREFIX/$ORACLE_SID/log
 
 # Disk space check
 dusage=$(df -Pk | grep -E "$MOUNTPOINT" | sed s/%//g | awk -v spaceWarn=$MV_SPACE_WARN '{ if($5 >= spaceWarn) print $0;}')