diff --git a/windows/libjackserver.rc b/windows/libjackserver.rc
index 5d6c453c..3197c646 100644
--- a/windows/libjackserver.rc
+++ b/windows/libjackserver.rc
@@ -1,4 +1,4 @@
-2006-2013// Generated by ResEdit 1.4.3
+// Generated by ResEdit 1.4.3
 // Copyright (C) 2006-2008
 // http://www.resedit.net
 
diff --git a/windows/portaudio/JackPortAudioDriver.cpp b/windows/portaudio/JackPortAudioDriver.cpp
index 61ae742a..a04bcec1 100644
--- a/windows/portaudio/JackPortAudioDriver.cpp
+++ b/windows/portaudio/JackPortAudioDriver.cpp
@@ -166,14 +166,14 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size,
     int in_max = 0;
     int out_max = 0;
     PaError err = paNoError;
-    
+
     if (!fPaDevices) {
         fPaDevices = new PortAudioDevices();
     }
 
     fCaptureLatency = capture_latency;
     fPlaybackLatency = playback_latency;
-    
+
     jack_log("JackPortAudioDriver::Open nframes = %ld in = %ld out = %ld capture name = %s playback name = %s samplerate = %ld",
              buffer_size, inchannels, outchannels, capture_driver_uid, playback_driver_uid, samplerate);
 
@@ -188,13 +188,13 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size,
             goto error;
         }
     }
-    
+
     // If ASIO, request for preferred size (assuming fInputDevice and fOutputDevice are the same)
-    if (buffer_size == 0) { 
+    if (buffer_size == 0) {
         buffer_size = fPaDevices->GetPreferredBufferSize(fInputDevice);
         jack_log("JackPortAudioDriver::Open preferred buffer_size = %d", buffer_size);
     }
-  
+
     // Generic JackAudioDriver Open
     if (JackAudioDriver::Open(buffer_size, samplerate, capturing, playing, inchannels, outchannels, monitor,
         capture_driver_uid, playback_driver_uid, capture_latency, playback_latency) != 0) {
@@ -303,7 +303,7 @@ int JackPortAudioDriver::Start()
         if ((err = Pa_StartStream(fStream)) == paNoError) {
             return 0;
         }
-        jack_error("Pa_StartStream error = %s", Pa_GetErrorText(err))
+        jack_error("Pa_StartStream error = %s", Pa_GetErrorText(err));
         JackAudioDriver::Stop();
     }
     return -1;
@@ -331,11 +331,11 @@ int JackPortAudioDriver::SetBufferSize(jack_nframes_t buffer_size)
         jack_error("Pa_CloseStream error = %s", Pa_GetErrorText(err));
         goto error;
     }
-    
+
     // It seems that some ASIO drivers (like ASIO4All) needs this to restart correctly;
     delete fPaDevices;
     fPaDevices = new PortAudioDevices();
-  
+
     err = OpenStream(buffer_size);
     if (err != paNoError) {
         jack_error("Pa_OpenStream error = %s", Pa_GetErrorText(err));
@@ -344,7 +344,7 @@ int JackPortAudioDriver::SetBufferSize(jack_nframes_t buffer_size)
         JackAudioDriver::SetBufferSize(buffer_size); // Generic change, never fails
         return 0;
     }
-    
+
 error:
     fStream = NULL;
     return -1;
diff --git a/windows/portaudio/JackPortAudioDriver.h b/windows/portaudio/JackPortAudioDriver.h
index ab27f4f3..9897f609 100644
--- a/windows/portaudio/JackPortAudioDriver.h
+++ b/windows/portaudio/JackPortAudioDriver.h
@@ -36,12 +36,12 @@ class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver
 
     private:
 
-        PortAudioDevices* fPaDevices;
         PaStream* fStream;
         jack_default_audio_sample_t** fInputBuffer;
         jack_default_audio_sample_t** fOutputBuffer;
         PaDeviceIndex fInputDevice;
         PaDeviceIndex fOutputDevice;
+        PortAudioDevices* fPaDevices;
 
         static int Render(const void* inputBuffer, void* outputBuffer,
                           unsigned long framesPerBuffer,