diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp
index 46efba12..2855fb17 100644
--- a/common/JackNetDriver.cpp
+++ b/common/JackNetDriver.cpp
@@ -581,7 +581,7 @@ namespace Jack
         for (int audio_port_index = 0; audio_port_index < fPlaybackChannels; audio_port_index++) {
         #ifdef OPTIMIZED_PROTOCOL
             // Port is connected on other side...
-            if ((uintptr_t)fNetAudioPlaybackBuffer->GetBuffer(audio_port_index) == -1) {
+            if ((intptr_t)fNetAudioPlaybackBuffer->GetBuffer(audio_port_index) == -1) {
                 fNetAudioPlaybackBuffer->SetBuffer(audio_port_index, GetOutputBuffer(audio_port_index, true));
             } else {
                 fNetAudioPlaybackBuffer->SetBuffer(audio_port_index, NULL);
diff --git a/common/JackNetManager.cpp b/common/JackNetManager.cpp
index 2d7aa5e9..a0c14de3 100644
--- a/common/JackNetManager.cpp
+++ b/common/JackNetManager.cpp
@@ -437,7 +437,7 @@ namespace Jack
         for (int audio_port_index = 0; audio_port_index < fParams.fSendAudioChannels; audio_port_index++) {
 
         #ifdef OPTIMIZED_PROTOCOL
-            if ((uintptr_t)fNetAudioCaptureBuffer->GetBuffer(audio_port_index) == -1) {
+            if ((intptr_t)fNetAudioCaptureBuffer->GetBuffer(audio_port_index) == -1) {
                 // Port is connected on other side...
                 fNetAudioCaptureBuffer->SetBuffer(audio_port_index,
                                                 static_cast<sample_t*>(jack_port_get_buffer_nulled(fAudioCapturePorts[audio_port_index],
diff --git a/common/JackNetTool.h b/common/JackNetTool.h
index e339ae45..844ed0b8 100644
--- a/common/JackNetTool.h
+++ b/common/JackNetTool.h
@@ -585,8 +585,9 @@ namespace Jack
                 }
 
                 fLastSubCycle = sub_cycle;
-                return res;
             }
+
+            return res;
         }
 
         virtual int RenderToNetwork(char* net_buffer,int sub_cycle, uint32_t& port_num)