diff --git a/client/gpu_detect.cpp b/client/gpu_detect.cpp
index 276bea7f2c..2191631612 100644
--- a/client/gpu_detect.cpp
+++ b/client/gpu_detect.cpp
@@ -18,7 +18,9 @@
 
 // client-specific GPU code.  Mostly GPU detection
 
-//#define USE_CHILD_PROCESS_TO_DETECT_GPUS 1
+#ifndef _DEBUG
+#define USE_CHILD_PROCESS_TO_DETECT_GPUS 1
+#endif
 
 #include "cpp.h"
 
diff --git a/samples/vboxwrapper/vbox.cpp b/samples/vboxwrapper/vbox.cpp
index cb2691b04b..d4e77c9755 100644
--- a/samples/vboxwrapper/vbox.cpp
+++ b/samples/vboxwrapper/vbox.cpp
@@ -973,6 +973,8 @@ int VBOX_VM::register_vm() {
     }
 
     // Add storage controller to VM
+    // See: http://www.virtualbox.org/manual/ch08.html#vboxmanage-storagectl
+    // See: http://www.virtualbox.org/manual/ch05.html#iocaching
     //
     fprintf(
         stderr,
@@ -983,6 +985,10 @@ int VBOX_VM::register_vm() {
     command += "--name \"Hard Disk Controller\" ";
     command += "--add \"" + vm_disk_controller_type + "\" ";
     command += "--controller \"" + vm_disk_controller_model + "\" ";
+    command += "--hostiocache off ";
+    if ((vm_disk_controller_type == "sata") || (vm_disk_controller_type == "SATA") {
+        command += "--sataportcount 1 ";
+    }
 
     retval = vbm_popen(command, output, "add storage controller (fixed disk)");
     if (retval) return retval;