diff --git a/common/JackGlobals.h b/common/JackGlobals.h
index 7bd61581..63dc9ab2 100644
--- a/common/JackGlobals.h
+++ b/common/JackGlobals.h
@@ -23,10 +23,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackPlatformPlug.h"
 #include "JackConstants.h"
 
+#ifdef __CLIENTDEBUG__ 
 #include <iostream>
 #include <fstream>
 #include <string>
 #include <time.h>
+#endif 
 
 namespace Jack
 {
diff --git a/macosx/coreaudio/JackCoreAudioDriver.cpp b/macosx/coreaudio/JackCoreAudioDriver.cpp
index e540a164..55f5d4d2 100644
--- a/macosx/coreaudio/JackCoreAudioDriver.cpp
+++ b/macosx/coreaudio/JackCoreAudioDriver.cpp
@@ -1623,7 +1623,7 @@ int JackCoreAudioDriver::Start()
         return -1;
     }
     
-    // Waiting for Measure callback to be called ( = driver has started)
+    // Waiting for Measure callback to be called (= driver has started)
     fState = false;
     int count = 0;
     while (!fState && count++ < WAIT_COUNTER) {