diff --git a/BigPictureTV.pro b/BigPictureTV.pro
index dcedd2c..02a9417 100644
--- a/BigPictureTV.pro
+++ b/BigPictureTV.pro
@@ -1,4 +1,4 @@
-QT       += core gui
+QT += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
@@ -14,9 +14,10 @@ GIT_COMMIT_DATE = $$system(git log -n 1 --pretty=format:"%ci")
 GIT_BRANCH = $$system(git branch --show-current)
 
 DEFINES += \
-    GIT_COMMIT_ID=\"\"\"$$GIT_COMMIT_ID\"\"\" \
-    GIT_COMMIT_DATE=\"\"\"$$GIT_COMMIT_DATE\"\"\" \
-    GIT_BRANCH=\"\"\"$$GIT_BRANCH\"\"\" \
+    GIT_COMMIT_ID=\\"\"\"$$GIT_COMMIT_ID\\"\"\" \
+    GIT_COMMIT_DATE=\\"\"\"$$GIT_COMMIT_DATE\\"\"\" \
+    GIT_BRANCH=\\"\"\"$$GIT_BRANCH\\"\"\"
+
 
 
 INCLUDEPATH += \
diff --git a/src/BigPictureTV/bigpicturetv.cpp b/src/BigPictureTV/bigpicturetv.cpp
index 7d66d40..3e96864 100644
--- a/src/BigPictureTV/bigpicturetv.cpp
+++ b/src/BigPictureTV/bigpicturetv.cpp
@@ -64,10 +64,8 @@ void BigPictureTV::createTrayIcon()
 
 void BigPictureTV::checkWindowTitle()
 {
-    if (target_window_mode == 1) {
-        if (custom_window_title == "") {
-            return;
-        }
+    if (target_window_mode == 1 && custom_window_title == "") {
+        return;
     }
 
     if (utils->isSunshineStreaming()) {
diff --git a/src/Configurator/configurator.cpp b/src/Configurator/configurator.cpp
index cc44a17..46d96c2 100644
--- a/src/Configurator/configurator.cpp
+++ b/src/Configurator/configurator.cpp
@@ -134,7 +134,6 @@ void Configurator::onAudioButtonClicked()
                              "Please check if PowerShell is installed and properly configured.");
         QMessageBox::critical(this, status, message);
     } else {
-        QString output = process.readAllStandardOutput();
         QString errorOutput = process.readAllStandardError();
         int exitCode = process.exitCode();
 
diff --git a/src/NightLightSwitcher/NightLightSwitcher.cpp b/src/NightLightSwitcher/NightLightSwitcher.cpp
index 7efc96e..57cae7c 100644
--- a/src/NightLightSwitcher/NightLightSwitcher.cpp
+++ b/src/NightLightSwitcher/NightLightSwitcher.cpp
@@ -30,7 +30,7 @@ bool NightLightSwitcher::enabled() {
     BYTE data[1024];
     DWORD dataSize = sizeof(data);
     if (RegQueryValueEx(hKey, L"Data", NULL, NULL, data, &dataSize) != ERROR_SUCCESS) {
-        std::wcerr << L"Failed to query registry value." << std::endl;
+        qDebug() << "Failed to query registry value.";
         return false;
     }
 
@@ -57,7 +57,7 @@ void NightLightSwitcher::toggle() {
     BYTE data[1024];
     DWORD dataSize = sizeof(data);
     if (RegQueryValueEx(hKey, L"Data", NULL, NULL, data, &dataSize) != ERROR_SUCCESS) {
-        std::wcerr << L"Failed to query registry value." << std::endl;
+        qDebug() << "Failed to query registry value.";
         return;
     }
 
@@ -90,11 +90,9 @@ void NightLightSwitcher::toggle() {
     }
 
     // Set the modified data back to the registry
-    DWORD newDataSize = newData.size();
+    DWORD newDataSize = static_cast<DWORD>(newData.size());
     if (RegSetValueEx(hKey, L"Data", 0, REG_BINARY, newData.data(), newDataSize) != ERROR_SUCCESS) {
-        std::wcerr << L"Failed to update registry value." << std::endl;
-    } else {
-        qDebug() << "Registry value updated successfully.";
+        qDebug() << "Failed to update registry value.";
     }
 }