diff --git a/node_build/make.js b/node_build/make.js
index 5902ccf..fa7c574 100644
--- a/node_build/make.js
+++ b/node_build/make.js
@@ -91,7 +91,7 @@ Builder.configure({
 
     if (!builder.config.crossCompiling) {
         if (NO_MARCH_FLAG.indexOf(process.arch) == -1) {
-            builder.config.cflags.push('-march=native');
+            builder.config.cflags.push('-mtune=generic');
         }
     }
 
@@ -256,7 +256,7 @@ Builder.configure({
 
     }).nThen(function (waitFor) {
 
-        builder.config.libs.push(libuvLib);
+        builder.config.libs.push('-luv');
         if (!android) {
             builder.config.libs.push('-lpthread');
         }
@@ -283,15 +283,13 @@ Builder.configure({
             );
         }
 
-        builder.config.includeDirs.push(dependencyDir + '/libuv/include/');
+        /* builder.config.includeDirs.push('/usr/include/uv/'); */
 
         var libuvBuilt;
         var python;
         nThen(function (waitFor) {
 
-            Fs.exists(libuvLib, waitFor(function (exists) {
-                if (exists) { libuvBuilt = true; }
-            }));
+            libuvBuilt = true;
 
         }).nThen(function (waitFor) {
 
diff --git a/test/Beacon_test.c b/test/Beacon_test.c
index 7ffd0f9..277ffd1 100644
--- a/test/Beacon_test.c
+++ b/test/Beacon_test.c
@@ -271,7 +271,8 @@ int main()
     start(Allocator_child(alloc), logger, base, rand, runTest);
 
     EventBase_beginLoop(base);
-    Allocator_free(alloc);
+    EventBase_endLoop(base);
+    /* Allocator_free(alloc); */
     return 0;
 }
 #endif
diff --git a/util/events/libuv/Timeout.c b/util/events/libuv/Timeout.c
index 5d3a077..503a378 100644
--- a/util/events/libuv/Timeout.c
+++ b/util/events/libuv/Timeout.c
@@ -68,7 +68,7 @@ static void unlinkTo(struct Timeout* timeout)
 /**
  * The callback to be called by libuv.
  */
-static void handleEvent(uv_timer_t* handle, int status)
+static void handleEvent(uv_timer_t* handle)
 {
     struct Timeout* timeout = Identity_check((struct Timeout*) handle);
     if (!timeout->isArmed) { return; }
@@ -196,4 +196,4 @@ void Timeout_clearAll(struct EventBase* eventBase)
 int Timeout_isActive(struct Timeout* timeout)
 {
     return (timeout && timeout->selfPtr);
-}
\ No newline at end of file
+}