diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index 669307e776..a83f34faa0 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -154,7 +154,7 @@ IM_MAD = [
 #IM_MAD = [
 #      name       = "im_vmware",
 #      executable = "one_im_sh",
-#      arguments  = "-t 15 -r 0 vmware" ]
+#      arguments  = "-c -t 15 -r 0 vmware" ]
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
diff --git a/src/vmm_mad/remotes/vmware/attach_disk b/src/vmm_mad/remotes/vmware/attach_disk
index 14223c277a..ef8d722bc5 100644
--- a/src/vmm_mad/remotes/vmware/attach_disk
+++ b/src/vmm_mad/remotes/vmware/attach_disk
@@ -21,6 +21,7 @@ source $PWD/scripts_common_sh.sh
 DEPLOYID="$1"
 SOURCE="$2"
 TARGET="$3"
+TARGET_NUMBER="$4"
 CONTROLLER_NUMBER=0 # Only one controller at the moment (up to 16 devices)
 
 
@@ -35,8 +36,6 @@ DISK_PATH="/vmfs/volumes/$DATASTORE/$VM_ID/$DISK_NAME/disk.vmdk"
 # Get the VMware ID corresponding to the deploy_id
 VMWAREID=`vim-cmd vmsvc/getallvms|grep $DEPLOYID|cut -d' ' -f 1`
 
-TARGET_NUMBER=1
-
 ATTACH_PARAMS="$VMWAREID $DISK_PATH $CONTROLLER_NUMBER $TARGET_NUMBER $DATASTORE"
 
 exec_and_log "$SUDO vim-cmd vmsvc/device.diskaddexisting $ATTACH_PARAMS" \
diff --git a/src/vmm_mad/remotes/vmware/detach_disk b/src/vmm_mad/remotes/vmware/detach_disk
index 87596b8fe2..bd084e54d3 100644
--- a/src/vmm_mad/remotes/vmware/detach_disk
+++ b/src/vmm_mad/remotes/vmware/detach_disk
@@ -20,7 +20,8 @@ source $PWD/scripts_common_sh.sh
 
 DEPLOYID="$1"
 IMAGE_PATH="$2"
-UNIT_NUMBER="$3"
+UNIT="$3"
+UNIT_NUMBER="$4"
 
 CONTROLLER_NUMBER=0 # Only one controller at the moment (up to 16 devices)