diff --git a/src/channel.cpp b/src/channel.cpp
index 3b1ec420..4469120f 100755
--- a/src/channel.cpp
+++ b/src/channel.cpp
@@ -570,10 +570,6 @@ int CChannel::GetUploadRateKbps()
         SYSTEM_SAMPLE_RATE_HZ / iAudioSizeOut / 1000;
 }
 
-
-
-
-// TEST
 void CChannel::UpdateSocketBufferSize ( const double dAudioBufferDurationMs,
                                         const double dLocalStdDev )
 {
diff --git a/src/main.cpp b/src/main.cpp
index 4d048709..0ebe7c91 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -404,8 +404,12 @@ int main ( int argc, char** argv )
                 pMainWindow = &ServerDlg;
                 pApp        = &app; // needed for post-event routine
 
-                // show dialog
-                ServerDlg.show();
+                // show dialog (if not the minimized flag is set)
+                if ( !bStartMinimized )
+                {
+                    ServerDlg.show();
+                }
+
                 app.exec();
             }
             else
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 0442a42e..80744f30 100755
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -621,7 +621,7 @@ if ( rand() < ( RAND_MAX / 2 ) ) return false;
 
 
 /******************************************************************************\
-* Access-functions for creating and parsing messages                           *
+* Access functions for creating and parsing messages                           *
 \******************************************************************************/
 void CProtocol::CreateJitBufMes ( const int iJitBufSize )
 {