diff --git a/client/3rd/QtSsh/src/ssh/sshpacket.cpp b/client/3rd/QtSsh/src/ssh/sshpacket.cpp
index e75ab4a4..06160f11 100644
--- a/client/3rd/QtSsh/src/ssh/sshpacket.cpp
+++ b/client/3rd/QtSsh/src/ssh/sshpacket.cpp
@@ -138,7 +138,7 @@ QByteArray AbstractSshPacket::generateMac(const SshAbstractCryptoFacility &crypt
     quint32 seqNr) const
 {
     const quint32 seqNrBe = qToBigEndian(seqNr);
-    QByteArray data(reinterpret_cast<const char *>(&seqNrBe), sizeof seqNrBe);
+    QByteArray data(reinterpret_cast<const char *>(&seqNrBe), static_cast<int>(sizeof seqNrBe));
     data += QByteArray(m_data.constData(), length() + 4);
     return crypt.generateMac(data, data.size());
 }
@@ -150,8 +150,9 @@ quint32 AbstractSshPacket::minPacketSize() const
 
 void AbstractSshPacket::setLengthField(QByteArray &data)
 {
-    const quint32 length = qToBigEndian(data.size() - 4);
-    data.replace(qsizetype(0), 4, reinterpret_cast<const char *>(&length), 4);
+    const quint32 length = qToBigEndian<quint32>(data.size() - 4);
+    data.replace(static_cast<qsizetype>(0), static_cast<qsizetype>(4),
+                 reinterpret_cast<const char *>(&length), static_cast<qsizetype>(4));
 }
 
 } // namespace Internal
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index e871b243..9c8ea1df 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -42,7 +42,6 @@ set(BUILD_SHARED_LIBS OFF)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain)
 set(LIBS ${LIBS} qt6keychain)
 
-# TODO it seems like i'm doing it wrong
 include_directories(
     ${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/include
     ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include
@@ -166,7 +165,7 @@ endif()
 if(APPLE)
     add_compile_definitions(MVPN_MACOS)
 
-    # ICON   = $$PWD/images/app.icns //todo
+    # ICON   = $$PWD/images/app.icns
 
     set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/ui/macos_util.h)
     set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/ui/macos_util.mm)
@@ -368,6 +367,7 @@ if(ANDROID)
     endforeach()
 endif()
 
+# deploy artifacts required to run the application to the debug build folder
 if(WIN32)
     if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
         set(DIR_NAME "x64")
diff --git a/deploy/build_windows.bat b/deploy/build_windows.bat
index 4ccfdb32..b19a824c 100644
--- a/deploy/build_windows.bat
+++ b/deploy/build_windows.bat
@@ -25,19 +25,18 @@ set RELEASE_DIR=%WORK_DIR:"=%
 set OUT_APP_DIR=%RELEASE_DIR:"=%\client\release
 set DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\windows\x%BUILD_ARCH:"=%
 set INSTALLER_DATA_DIR=%RELEASE_DIR:"=%\installer\packages\%APP_DOMAIN:"=%\data
-@REM set QMAKE_STASH_FILE=%PROJECT_DIR:"=%\.qmake_stash
 set TARGET_FILENAME=%PROJECT_DIR:"=%\%APP_NAME:"=%_x%BUILD_ARCH:"=%.exe
 
 echo "Environment:"
 echo "APP_FILENAME:			%APP_FILENAME%"
 echo "PROJECT_DIR:			%PROJECT_DIR%"
-echo "SCRIPT_DIR:                   %SCRIPT_DIR%"
+echo "SCRIPT_DIR:           %SCRIPT_DIR%"
 echo "RELEASE_DIR:			%RELEASE_DIR%"
 echo "OUT_APP_DIR:			%OUT_APP_DIR%"
-echo "DEPLOY_DATA_DIR:              %DEPLOY_DATA_DIR%"
-echo "INSTALLER_DATA_DIR: 		%INSTALLER_DATA_DIR%"
-echo "QMAKE_STASH_FILE: 		%QMAKE_STASH_FILE%"
-echo "TARGET_FILENAME:              %TARGET_FILENAME%"
+echo "DEPLOY_DATA_DIR:      %DEPLOY_DATA_DIR%"
+echo "INSTALLER_DATA_DIR: 	%INSTALLER_DATA_DIR%"
+echo "QMAKE_STASH_FILE: 	%QMAKE_STASH_FILE%"
+echo "TARGET_FILENAME:      %TARGET_FILENAME%"
 
 rem Signing staff
 powershell Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope LocalMachine
@@ -47,12 +46,11 @@ powershell Import-PfxCertificate -FilePath %SCRIPT_DIR:"=%\PrivacyTechWindowsCer
 
 echo "Cleanup..."
 Rmdir /Q /S %RELEASE_DIR%
-@REM Del %QMAKE_STASH_FILE%
 Del %TARGET_FILENAME%
 
 call "%QT_BIN_DIR:"=%\qt-cmake" --version
 "%QT_BIN_DIR:"=%\windeployqt" -v
-cmake --version @REM use cmake from qt tools dir
+cmake --version
 
 cd %PROJECT_DIR%
 call "%QT_BIN_DIR:"=%\qt-cmake" . -B %WORK_DIR%
@@ -101,4 +99,4 @@ cd %PROJECT_DIR%
 signtool sign /v /sm /s My /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 "%TARGET_FILENAME%"
 
 echo "Finished, see %TARGET_FILENAME%"
-REM exit 0
+exit 0