diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 475f57341..6d32dd819 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -64,8 +64,10 @@ add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE
 	QPCSC.cpp
 	QPCSC_p.h
 	QPCSC.h
-	QPKCS11.cpp
-	QPKCS11.h
+	$<IF:$<PLATFORM_ID:Windows>,
+		QCNG.cpp QCNG.h,
+		QPKCS11.cpp QPKCS11.h
+	>
 	QSigner.cpp
 	QSigner.h
 	QSmartCard.cpp
@@ -194,7 +196,6 @@ if( APPLE )
 		COMMAND zip -r ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-dbg_${VERSION}$ENV{VER_SUFFIX}.zip ${PROJECT_NAME}.dSYM
 	)
 elseif(WIN32)
-	target_sources(${PROJECT_NAME} PRIVATE QCNG.cpp QCNG.h)
 	target_compile_options(${PROJECT_NAME} PRIVATE "/guard:cf")
 	target_link_options(${PROJECT_NAME} PRIVATE "/guard:cf" $<$<BOOL:${CROSSSIGNCERT}>:/INTEGRITYCHECK>)
 	target_link_libraries(${PROJECT_NAME} NCrypt Crypt32 Cryptui winscard)
diff --git a/client/QCryptoBackend.cpp b/client/QCryptoBackend.cpp
index 4c7640fe8..6b7c1d14a 100644
--- a/client/QCryptoBackend.cpp
+++ b/client/QCryptoBackend.cpp
@@ -23,8 +23,9 @@
 #include "TokenData.h"
 #ifdef Q_OS_WIN
 #include "QCNG.h"
-#endif
+#else
 #include "QPKCS11.h"
+#endif
 #include "QSigner.h"
 #include "QSmartCard.h"
 
@@ -88,13 +89,13 @@ QString QCryptoBackend::errorString(Status error)
 	switch( error )
 	{
 	case PinOK: return QString();
-	case PinCanceled: return QCoreApplication::translate("QCryptoBackend", "PIN entry canceled");
-	case PinLocked: return QCoreApplication::translate("QCryptoBackend", "PIN locked");
-	case PinIncorrect: return QCoreApplication::translate("QCryptoBackend", "PIN incorrect");
-	case InProgress: return QCoreApplication::translate("QCryptoBackend", "Signing/decrypting is already in progress another window.");
-	case GeneralError: return QCoreApplication::translate("QCryptoBackend", "PKCS11 general error");
-	case DeviceError: return QCoreApplication::translate("QCryptoBackend", "PKCS11 device error");
-	default: return QCoreApplication::translate("QCryptoBackend", "Unknown error");
+	case PinCanceled: return tr("PIN entry canceled");
+	case PinLocked: return tr("PIN locked");
+	case PinIncorrect: return tr("PIN incorrect");
+	case InProgress: return tr("Signing/decrypting is already in progress another window.");
+	case GeneralError: return tr("PKCS11 general error");
+	case DeviceError: return tr("PKCS11 device error");
+	default: return tr("Unknown error");
 	}
 }
 
diff --git a/client/QCryptoBackend.h b/client/QCryptoBackend.h
index cac9b42ca..1ec2f003e 100644
--- a/client/QCryptoBackend.h
+++ b/client/QCryptoBackend.h
@@ -21,6 +21,7 @@
 
 #include "TokenData.h"
 
+#include <QtCore/QCoreApplication>
 #include <QtCore/QCryptographicHash>
 
 #include <expected>
@@ -30,6 +31,7 @@ class QSslKey;
 
 class QCryptoBackend
 {
+	Q_DECLARE_TR_FUNCTIONS(QCryptoBackend);
 public:
 	enum Status : quint8
 	{
diff --git a/client/QPKCS11.cpp b/client/QPKCS11.cpp
index 919ce2eaf..7e5351b88 100644
--- a/client/QPKCS11.cpp
+++ b/client/QPKCS11.cpp
@@ -135,7 +135,9 @@ std::shared_ptr<QPKCS11Library> QPKCS11Library::current()
 		{ "/Library/Frameworks/eToken.framework/Versions/Current/libIDPrimePKCS11.dylib", "3BFF9600008131FE4380318065B0855956FB120FFE82900000" },
 		{ "/Library/Frameworks/eToken.framework/Versions/Current/libIDPrimePKCS11.dylib", "3BFF9600008131FE4380318065B08505003912017882900040" },
 #elif defined(Q_OS_WIN)
+#ifdef _DEBUG
 		{ "opensc-pkcs11.dll", {} },
+#endif
 #else
 		{ "opensc-pkcs11.so", {} },
 #if defined(Q_OS_LINUX)