diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp
index e2031257..7ccc668f 100644
--- a/common/JackNetDriver.cpp
+++ b/common/JackNetDriver.cpp
@@ -378,28 +378,28 @@ namespace Jack
 
         for (int audio_port_index = 0; audio_port_index < fCaptureChannels; audio_port_index++) {
             if (fCapturePortList[audio_port_index] > 0) {
-                fGraphManager->ReleasePort ( fClientControl.fRefNum, fCapturePortList[audio_port_index]);
+                fGraphManager->ReleasePort(fClientControl.fRefNum, fCapturePortList[audio_port_index]);
                 fCapturePortList[audio_port_index] = 0;
             }
         }
 
         for (int audio_port_index = 0; audio_port_index < fPlaybackChannels; audio_port_index++) {
             if (fPlaybackPortList[audio_port_index] > 0) {
-                fGraphManager->ReleasePort ( fClientControl.fRefNum, fPlaybackPortList[audio_port_index]);
+                fGraphManager->ReleasePort(fClientControl.fRefNum, fPlaybackPortList[audio_port_index]);
                 fPlaybackPortList[audio_port_index] = 0;
             }
         }
 
         for (int midi_port_index = 0; midi_port_index < fParams.fSendMidiChannels; midi_port_index++) {
             if (fMidiCapturePortList && fMidiCapturePortList[midi_port_index] > 0) {
-                fGraphManager->ReleasePort ( fClientControl.fRefNum, fMidiCapturePortList[midi_port_index]);
-                fMidiCapturePortList[midi_port_index] =0;
+                fGraphManager->ReleasePort(fClientControl.fRefNum, fMidiCapturePortList[midi_port_index]);
+                fMidiCapturePortList[midi_port_index] = 0;
             }
         }
 
         for (int midi_port_index = 0; midi_port_index < fParams.fReturnMidiChannels; midi_port_index++) {
             if (fMidiPlaybackPortList && fMidiPlaybackPortList[midi_port_index] > 0) {
-                fGraphManager->ReleasePort ( fClientControl.fRefNum, fMidiPlaybackPortList[midi_port_index]);
+                fGraphManager->ReleasePort(fClientControl.fRefNum, fMidiPlaybackPortList[midi_port_index]);
                 fMidiPlaybackPortList[midi_port_index] = 0;
             }
         }
diff --git a/common/netjack.c b/common/netjack.c
index 1184e207..2b7eeb0d 100644
--- a/common/netjack.c
+++ b/common/netjack.c
@@ -55,11 +55,11 @@ $Id: net_driver.c,v 1.17 2006/04/16 20:16:10 torbenh Exp $
 #include <samplerate.h>
 #endif
 
+#include "JackError.h"
+
 #include "netjack.h"
 #include "netjack_packet.h"
 
-#include "JackError.h"
-
 #define MIN(x,y) ((x)<(y) ? (x) : (y))
 
 static int sync_state = 1;
diff --git a/common/netjack_packet.c b/common/netjack_packet.c
index 473cf3a2..21457798 100644
--- a/common/netjack_packet.c
+++ b/common/netjack_packet.c
@@ -68,14 +68,14 @@
 #include <samplerate.h>
 #endif
 
+#include "JackError.h"
+
 #if HAVE_CELT
 #include <celt/celt.h>
 #endif
 
 #include "netjack_packet.h"
 
-#include "JackError.h"
-
 #ifdef NO_JACK_ERROR
 #define jack_error printf
 #endif
diff --git a/example-clients/showtime.c b/example-clients/showtime.c
index af413e89..b40589fc 100644
--- a/example-clients/showtime.c
+++ b/example-clients/showtime.c
@@ -35,7 +35,7 @@ showtime ()
 	transport_state = jack_transport_query (client, &current);
 	frame_time = jack_frame_time (client);
 	
-	printf ("frame = %u  frame_time = %u usecs = %lld \t",  current.frame, frame_time, current.usecs);
+	printf ("frame = %u  frame_time = %u usecs = %ld \t",  current.frame, frame_time, current.usecs);
 
 	switch (transport_state) {
 	case JackTransportStopped: