diff --git a/binding.gyp b/binding.gyp
index 9ed57ea..7135e80 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -60,6 +60,8 @@
 						[
 							"<(medooze_media_server_src)/src/DependencyDescriptorLayerSelector.cpp",
 							"<(medooze_media_server_src)/src/EventLoop.cpp",
+							"<(medooze_media_server_src)/src/SystemPoll.cpp",
+							"<(medooze_media_server_src)/src/PollSignalling.cpp",
 							"<(medooze_media_server_src)/src/log.cpp",
 							"<(medooze_media_server_src)/src/PacketHeader.cpp",
 							"<(medooze_media_server_src)/src/MacAddress.cpp",
diff --git a/src/IncomingStreamBridge.i b/src/IncomingStreamBridge.i
index da23ce2..35ad667 100644
--- a/src/IncomingStreamBridge.i
+++ b/src/IncomingStreamBridge.i
@@ -21,7 +21,7 @@ public:
 		//Store event callback object
 		persistent = std::make_shared<Persistent<v8::Object>>(object);
 		//Start time service
-		loop.Start(-1);
+		loop.Start();
 		
 		//Create dispatch timer
 		dispatch = loop.CreateTimerUnsafe([this](std::chrono::milliseconds now){
@@ -649,4 +649,4 @@ public:
 	MediaFrameListenerBridgeShared GetVideo();
 	MediaFrameListenerBridgeShared GetMultitrackVideo(DWORD id);
 	void Stop();
-};
\ No newline at end of file
+};
diff --git a/src/rtmp-server_wrap.cxx b/src/rtmp-server_wrap.cxx
index 0196391..610a0f3 100644
--- a/src/rtmp-server_wrap.cxx
+++ b/src/rtmp-server_wrap.cxx
@@ -2336,7 +2336,7 @@ class IncomingStreamBridge :
 		//Store event callback object
 		persistent = std::make_shared<Persistent<v8::Object>>(object);
 		//Start time service
-		loop.Start(-1);
+		loop.Start();
 		
 		//Create dispatch timer
 		dispatch = loop.CreateTimerUnsafe([this](std::chrono::milliseconds now){