diff --git a/tests/test.cpp b/tests/test.cpp
index 0a4fd226..60ca7b08 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -553,6 +553,8 @@ int main (int argc, char *argv[])
 
     client_name1 = "jack_test";
     time_to_run = 1;
+    //verbose_mode = 1;
+    //RT = 1;
     while ((opt = getopt_long (argc, argv, options, long_options, &option_index)) != EOF) {
         switch (opt) {
             case 'k':
@@ -1201,8 +1203,8 @@ int main (int argc, char *argv[])
      * (as mentionned in the doc of jack_get_ports)
      *
      */
-    free(inports);
-    free(outports);
+    jack_free(inports);
+    jack_free(outports);
 
     /**
      * Try to "reactivate" the client whereas it's already activated...
@@ -1241,7 +1243,7 @@ int main (int argc, char *argv[])
         printf("!!! ERROR !!! %i ports have been created, and %i callback reg ports have been received !\n", j, port_callback_reg);
     }
 
-    free(inports); // free array of ports (as mentionned in the doc of jack_get_ports)
+    jack_free(inports); // free array of ports (as mentionned in the doc of jack_get_ports)
 
     /**
      *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -1405,7 +1407,7 @@ int main (int argc, char *argv[])
         connexions2 = jack_port_get_all_connections(client1, jack_port_by_name(client1, inports[0]));
     }
 
-    free (inports);
+    jack_free (inports);
     if (connexions1 == NULL) {
         Log("checking jack_port_get_connections() for external client... ok\n");
     } else {
@@ -1648,7 +1650,7 @@ int main (int argc, char *argv[])
     } else {
         Log("Checking renaming of an unregistered port... ok\n");
     }
-    free (inports);
+    jack_free (inports);
 
 
     /**
@@ -1664,6 +1666,7 @@ int main (int argc, char *argv[])
     Log("Checking about latency functions...\n");
     t_error = 0;
     jack_recompute_total_latencies(client1);
+    Log("jack_recompute_total_latencies...\n");
     if ((jack_port_get_latency (output_port1) != 0) ||
             (jack_port_get_total_latency(client1, output_port1) != 0) ) {
         t_error = 1;
@@ -1753,8 +1756,8 @@ int main (int argc, char *argv[])
 
 	jack_sleep(1000);
 
-    free(inports);
-    free(outports);
+    jack_free(inports);
+    jack_free(outports);
 
     /**
      * Checking transport API.
diff --git a/windows/jack_audioadapter.cbp b/windows/jack_audioadapter.cbp
index 088ca08e..883f058f 100644
--- a/windows/jack_audioadapter.cbp
+++ b/windows/jack_audioadapter.cbp
@@ -53,6 +53,8 @@
 					<Add library="libjackserver64" />
 					<Add library="libportaudio_x86_64.a" />
 					<Add library="libsamplerate_x86_64.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Debug64\bin" />
 				</Linker>
 			</Target>
@@ -78,6 +80,8 @@
 					<Add library="libjackserver64" />
 					<Add library="libportaudio_x86_64.a" />
 					<Add library="libsamplerate_x86_64.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
@@ -135,6 +139,8 @@
 					<Add library="libjackserver" />
 					<Add library="libportaudio_x86.a" />
 					<Add library="libsamplerate_x86.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Debug\bin" />
 				</Linker>
 				<ExtraCommands>
@@ -165,6 +171,8 @@
 					<Add library="libjackserver" />
 					<Add library="libportaudio_x86.a" />
 					<Add library="libsamplerate_x86.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Release\bin" />
 				</Linker>
 				<ExtraCommands>
diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp
index df2ce8fe..9d07ff75 100644
--- a/windows/jack_portaudio.cbp
+++ b/windows/jack_portaudio.cbp
@@ -43,8 +43,8 @@
 				<Option type="3" />
 				<Option compiler="mingw_64" />
 				<Compiler>
-					<Add option="-W" />
 					<Add option="-g" />
+					<Add option="-W" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_CONSOLE" />
@@ -62,6 +62,8 @@
 				<Linker>
 					<Add library="libjackserver64" />
 					<Add library="libportaudio_x86_64.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Debug64\bin" />
 					<Add directory="..\windows" />
 				</Linker>
@@ -92,6 +94,8 @@
 				<Linker>
 					<Add library="libjackserver64" />
 					<Add library="libportaudio_x86_64.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Release64\bin" />
 					<Add directory="..\windows" />
 				</Linker>
@@ -138,8 +142,8 @@
 				<Option type="3" />
 				<Option compiler="mingw_64" />
 				<Compiler>
-					<Add option="-W" />
 					<Add option="-g" />
+					<Add option="-W" />
 					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
@@ -159,6 +163,8 @@
 					<Add option="-m32" />
 					<Add library="libjackserver" />
 					<Add library="libportaudio_x86.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Debug\bin" />
 					<Add directory="..\windows" />
 				</Linker>
@@ -194,6 +200,8 @@
 					<Add option="-m32" />
 					<Add library="libjackserver" />
 					<Add library="libportaudio_x86.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
 				</Linker>
diff --git a/windows/jack_unload.cbp b/windows/jack_unload.cbp
index 9ef16ee8..454e08d0 100644
--- a/windows/jack_unload.cbp
+++ b/windows/jack_unload.cbp
@@ -25,7 +25,7 @@
 			</Target>
 			<Target title="Win32 Debug 64bits">
 				<Option output="Debug64\bin\jack_unload" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Debug\64" />
+				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
 				<Compiler>