diff --git a/src/datastore_mad/remotes/vmfs/cp b/src/datastore_mad/remotes/vmfs/cp
index 3dd91b2fe5..d3b7134e2f 100755
--- a/src/datastore_mad/remotes/vmfs/cp
+++ b/src/datastore_mad/remotes/vmfs/cp
@@ -86,7 +86,7 @@ fi
 if [ "$SSH" == "yes" ]; then
     ssh_make_path $DST_HOST $DST
 else
-    exec_and_log "vifs $VI_PARAMS --mkdir [$DS_ID]$DST_FOLDER" \ 
+    exec_and_log "vifs $VI_PARAMS --mkdir [$DS_ID]$DST_FOLDER" \
                  "Cannot create $DST in $DST_HOST"
 fi
 
@@ -136,7 +136,7 @@ esac
 if [ ! -f $SRC/disk.vmdk ]; then
     BASE_DISK_FILE=`ls $SRC | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'`
 
-    exec_and_log "mv -f $SRC/$BASE_DISK_FILE $SRC/disk.vmdk" \        
+    exec_and_log "mv -f $SRC/$BASE_DISK_FILE $SRC/disk.vmdk" \
                  "Error renaming disk file $SRC/$BASE_DISK_FILE to $SRC/disk.vmdk"
 fi
 
@@ -147,7 +147,7 @@ else
     cd $SRC
     for file in $(find . -type f); do
         FNAME=$(basename $file)
-        exec_and_log "vifs $VI_PARAMS -p $file [$DS_ID]$DST_FOLDER/$FNAME" \ 
+        exec_and_log "vifs $VI_PARAMS -p $file [$DS_ID]$DST_FOLDER/$FNAME" \
                      "Cannot upload $file to $DST/$FNAME on $DST_HOST"
     done
 fi
diff --git a/src/datastore_mad/remotes/vmfs/mkfs b/src/datastore_mad/remotes/vmfs/mkfs
index 5b133e49e6..1daf2648ca 100755
--- a/src/datastore_mad/remotes/vmfs/mkfs
+++ b/src/datastore_mad/remotes/vmfs/mkfs
@@ -86,19 +86,20 @@ fi
 
 # ------------ Create the image within the image datastore ------------
 
-log "Making filesystem of ${SIZE}M (with no format) at $DST"
+log "Making filesystem of ${SIZE}M (with no format) at [$IMAGE_DS_ID]$DST_FOLDER on $DST_HOST"
 
 IMAGE_FORMAT=vmdk
 VMWARE_DISK_TYPE=`echo $FSTYPE|cut -d'_' -f 2`
 
 if [ "$SSH" == "yes" ]; then    
-    ssh_exec_and_log $DST_HOST "mkdir -p $DST" "Could not create disk directory $DST"
-    ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -U $DST/disk.vmdk"
-    ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} $DST/disk.vmdk" \ 
-                               "Cannot create $DST/disk.vmdk on $DST_HOST"
+    ssh_exec_and_log $DST_HOST "mkdir -p /vmfs/volumes/$IMAGE_DS_ID/$DST_FOLDER" \
+                               "Could not create disk directory /vmfs/volumes/$IMAGE_DS_ID/$DST_FOLDER on $DST_HOST"
+    ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -U [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk"
+    ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk" \ 
+                               "Cannot create [$IMAGE_DS_ID] $DST_FOLDER/disk.vmdk on $DST_HOST"
 else
-    exec_and_log "$VMKFSTOOLS $VI_PARAMS -U $DST_PATH/disk.vmdk"
-    exec_and_log "vifs $VI_PARAMS --mkdir [$IMAGE_DS_ID]$DST_FOLDER" \ 
+    exec_and_log "$VMKFSTOOLS $VI_PARAMS -U [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk"
+    exec_and_log "vifs $VI_PARAMS --mkdir [$IMAGE_DS_ID]$DST_FOLDER" \
                  "Cannot create [$IMAGE_DS_ID] $DST_FOLDER on $DST_HOST"
     exec_and_log "$VMKFSTOOLS $VI_PARAMS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk" \ 
                  "Cannot create $IMAGE_DS_ID]$DST_FOLDER/disk.vmdk on $DST_HOST"
diff --git a/src/datastore_mad/remotes/vmfs/rm b/src/datastore_mad/remotes/vmfs/rm
index ed122633f4..c93fc23b2d 100755
--- a/src/datastore_mad/remotes/vmfs/rm
+++ b/src/datastore_mad/remotes/vmfs/rm
@@ -69,17 +69,17 @@ log "Removing $SRC from the image repository"
 
 if [ "$SSH" == "yes" ]; then   
     if [ -n $DS_NAME -a -n $DST_FOLDER ]; then
-    	ssh_exec_and_log $DST_HOST "rm -rf /vmfs/volumes/$DS_NAME/$DST_FOLDER" \ 
+    	ssh_exec_and_log $DST_HOST "rm -rf /vmfs/volumes/$DS_NAME/$DST_FOLDER" \
                                    "Error deleting $SRC"
     fi
 else
 	# We have to erase the contents of the folder one by one
-	FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$DS_NAME]$FOLDER_TO_ERASE|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"`
+	FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$DS_NAME]$DST_FOLDER|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"`
 	for file in $FILES_TO_ERASE; do
-		exec_and_log "vifs $VI_PARAMS --force --rm [$DS_NAME]$DST_FOLDER/$file"\
+		exec_and_log "vifs $VI_PARAMS --force --rm [$DS_NAME]$DST_FOLDER/$file" \
                      "Cannot delete $DST_FOLDER/$file in $DST_HOST"
 	done
-	exec_and_log "vifs $VI_PARAMS --force --rm [$DS_NAME]$DST_FOLDER" \ 
+	exec_and_log "vifs $VI_PARAMS --force --rm [$DS_NAME]$DST_FOLDER" \
                  "Cannot delete $DST_FOLDER in $DST_HOST"
 fi
 
diff --git a/src/tm_mad/vmware/clone b/src/tm_mad/vmware/clone
index cf8d6b0325..0c9855a58e 100755
--- a/src/tm_mad/vmware/clone
+++ b/src/tm_mad/vmware/clone
@@ -67,7 +67,7 @@ if [ "$SSH" == "yes" ]; then
 else
 	# Two calls needed since vifs cannot do a mkdir -p
 	vifs $VI_PARAMS --mkdir [$SYSTEM_DS_NAME]$VMID
-	exec_and_log "vifs $VI_PARAMS --mkdir [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER" \ 
+	exec_and_log "vifs $VI_PARAMS --mkdir [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER" \
                  "Cannot create [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER in $DST_HOST"
 fi
 
@@ -93,7 +93,8 @@ EOF
 )
 	ssh_exec_and_log $DST_HOST "$CLONESCRIPT" "Error cloning $SRC to $DST"
 else
-	exec_and_log "$VMKFSTOOLS $VI_PARAMS -i \"$SRC_DIR_WITHOUT_DS_PATH/disk.vmdk\" -d thin \"$DST_DIR_WITHOUT_DS_PATH/disk.vmdk\"" "Error cloning $SRC to $DST"
+	exec_and_log "$VMKFSTOOLS $VI_PARAMS -i \"$SRC_DIR_WITHOUT_DS_PATH/disk.vmdk\" -d thin \"$DST_DIR_WITHOUT_DS_PATH/disk.vmdk\"" \
+                 "Error cloning $SRC to $DST"
 fi
 
 exit 0
diff --git a/src/tm_mad/vmware/context b/src/tm_mad/vmware/context
index 5f15f9670a..2e45357d37 100755
--- a/src/tm_mad/vmware/context
+++ b/src/tm_mad/vmware/context
@@ -61,7 +61,7 @@ if [ "$SSH" == "yes" ]; then
 else
     vifs $VI_PARAMS --mkdir [$DS_ID]$VM_ID
     exec_and_log "vifs $VI_PARAMS --mkdir [$DS_ID]$VM_ID/$DST_FOLDER" \
-                 "Cannot create [$DS_ID]$VM_ID/$DST_FOLDER on %DST_HOST"
+                 "Cannot create [$DS_ID]$VM_ID/$DST_FOLDER on $DST_HOST"
 fi
 
 #-------------------------------------------------------------------------------
@@ -91,7 +91,8 @@ if [ "$SSH" == "yes" ]; then
     exec_and_log "$SCP $ISO_FILE $DST" "Error copying context ISO to $DST"
 else
     # Copies the iso file with .iso suffix, needed for VMware CDROMs
-    exec_and_log "vifs $VI_PARAMS -p $ISO_FILE $DST_PATH.iso" "Error copying context ISO to $DST"
+    exec_and_log "vifs $VI_PARAMS -p $ISO_FILE $DST_PATH.iso" \
+                 "Error copying context ISO to $DST"
 fi
 
 rm -rf $ISO_DIR > /dev/null 2>&1
diff --git a/src/tm_mad/vmware/delete b/src/tm_mad/vmware/delete
index f2664cde51..4ab03ced7f 100755
--- a/src/tm_mad/vmware/delete
+++ b/src/tm_mad/vmware/delete
@@ -57,7 +57,7 @@ if [ "$SSH" == "yes" ]; then
 else
 	USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
 	PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
-	exec_and_log "$VMKFSTOOLS --server $DST_HOST --username $USERNAME --password $PASSWORD -U $DST_PATH" \ 
+	exec_and_log "$VMKFSTOOLS --server $DST_HOST --username $USERNAME --password $PASSWORD -U $DST_PATH" \
 	             "Cannot delelete $DST"
 fi
 
diff --git a/src/tm_mad/vmware/ln b/src/tm_mad/vmware/ln
index 96aca88290..cf6dacf3e1 100755
--- a/src/tm_mad/vmware/ln
+++ b/src/tm_mad/vmware/ln
@@ -70,7 +70,7 @@ for file in \$(cd $DST_DIR  ; find $SRC_PATH -type f); do
 done
 EOF
 )
-	ssh_exec_and_log $DST_HOST "$LINK_SCRIPT" \ 
+	ssh_exec_and_log $DST_HOST "$LINK_SCRIPT" \
 	      "Could not link dir files from source DS to system DS"
 else
 	log "Cannot link files without SSH enabled on the ESX hosts"
diff --git a/src/tm_mad/vmware/mkimage b/src/tm_mad/vmware/mkimage
index bcd93f25b0..a91cf68bb6 100755
--- a/src/tm_mad/vmware/mkimage
+++ b/src/tm_mad/vmware/mkimage
@@ -82,7 +82,7 @@ else
 
     VMWARE_DISK_TYPE=`echo $FSTYPE|cut -d'_' -f 2`
     exec_and_log "$VMKFSTOOLS $VI_PARAMS -U $DST_PATH/disk.vmdk"
-    exec_and_log "$VMKFSTOOLS $VI_PARAMS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} $DST/disk.vmdk" \ 
+    exec_and_log "$VMKFSTOOLS $VI_PARAMS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} $DST/disk.vmdk" \
                  "Cannot create $DST/disk.vmdk on $DST_HOST"
 fi
 
diff --git a/src/tm_mad/vmware/mvds b/src/tm_mad/vmware/mvds
index 215208402d..6a5e779e74 100755
--- a/src/tm_mad/vmware/mvds
+++ b/src/tm_mad/vmware/mvds
@@ -92,7 +92,7 @@ EOF
 
 	ssh_exec_and_log $SRC_HOST "$MVSCRIPT" "Could not move image $DST_PATH"
 else
-	exec_and_log "$VMKFSTOOLS $VI_PARAMS -i $SRC_PATH -d thin $DST_PATH" \ 
+	exec_and_log "$VMKFSTOOLS $VI_PARAMS -i $SRC_PATH -d thin $DST_PATH" \
 	             "Could not move image $DST_PATH"
 fi