diff --git a/.gitignore b/.gitignore
index 213fc0c..df170ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ build
 artifacts
 
 .cmake
+.idea
 
 # Auto generated DBus files
 *_adaptor.cpp
@@ -62,7 +63,7 @@ target_wrapper.*
 # QtCreator CMake
 CMakeLists.txt.user*
 
-# QtCreator 4.8< compilation database 
+# QtCreator 4.8< compilation database
 compile_commands.json
 
 # QtCreator local machine specific files for imported projects
diff --git a/GPClient/CMakeLists.txt b/GPClient/CMakeLists.txt
index 3bfe1cb..cf1c751 100644
--- a/GPClient/CMakeLists.txt
+++ b/GPClient/CMakeLists.txt
@@ -92,7 +92,7 @@ target_link_libraries(gpclient
     QtSignals
 )
 
-if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
+if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0 AND CMAKE_BUILD_TYPE STREQUAL Release)
     target_compile_options(gpclient PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
 endif()
 
diff --git a/GPClient/gpclient.cpp b/GPClient/gpclient.cpp
index 57e6445..084410d 100644
--- a/GPClient/gpclient.cpp
+++ b/GPClient/gpclient.cpp
@@ -35,7 +35,7 @@ GPClient::GPClient(QWidget *parent, IVpn *vpn)
     connect(ov, SIGNAL(error(QString)), this, SLOT(onVPNError(QString)));
     connect(ov, SIGNAL(logAvailable(QString)), this, SLOT(onVPNLogAvailable(QString)));
 
-    // Initiallize the context menu of system tray.
+    // Initialize the context menu of system tray.
     initSystemTrayIcon();
     initVpnStatus();
 }
diff --git a/GPClient/main.cpp b/GPClient/main.cpp
index 92b1391..0c91fc7 100644
--- a/GPClient/main.cpp
+++ b/GPClient/main.cpp
@@ -1,6 +1,5 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtCore/QDir>
 #include <QtCore/QStandardPaths>
 #include <plog/Log.h>
 #include <plog/Init.h>
diff --git a/GPService/gpservice.cpp b/GPService/gpservice.cpp
index 6fa6db8..754cee9 100644
--- a/GPService/gpservice.cpp
+++ b/GPService/gpservice.cpp
@@ -136,7 +136,7 @@ void GPService::connect(QString server, QString username, QString passwd)
          << "--cookie-on-stdin"
          << server;
 
-    log("Start process with arugments: " + args.join(" "));
+    log("Start process with arugments: " + args.join(", "));
 
     openconnect->start(bin, args);
     openconnect->write((passwd + "\n").toUtf8());