diff --git a/ccid/src/cats-test.c b/ccid/src/cats-test.c
index cc141d6..7c48462 100644
--- a/ccid/src/cats-test.c
+++ b/ccid/src/cats-test.c
@@ -23,6 +23,9 @@
 #include <winscard.h>
 #include <time.h>
 
+#pragma comment(lib, "ws2_32.lib")
+#pragma comment(lib, "winscard.lib")
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -205,7 +208,6 @@ main(int argc, char *argv[])
         goto err;
 
 
-#define SIMULATE_BUERGERCLIENT 1
 #ifdef SIMULATE_BUERGERCLIENT
     r = SCardReconnect(hCard, SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_ANY,
             SCARD_LEAVE_CARD, &protocol);
@@ -320,7 +322,6 @@ main(int argc, char *argv[])
             difftime(t_end, t_start));
 
 
-#define SIMULATE_TA_CA 1
 #ifdef SIMULATE_TA_CA
     r = SCardReconnect(hCard, SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_ANY,
             SCARD_LEAVE_CARD, &protocol);
diff --git a/ccid/src/pcscutil.c b/ccid/src/pcscutil.c
index f1cbcf5..d80f72c 100644
--- a/ccid/src/pcscutil.c
+++ b/ccid/src/pcscutil.c
@@ -21,6 +21,8 @@
 
 #include "pcscutil.h"
 
+#pragma comment(lib, "winscard.lib")
+
 LONG
 pcsc_connect(unsigned int readernum, DWORD dwShareMode, DWORD dwPreferredProtocols,
         LPSCARDCONTEXT phContext, LPSTR *readers, LPSCARDHANDLE phCard,
@@ -39,7 +41,7 @@ pcsc_connect(unsigned int readernum, DWORD dwShareMode, DWORD dwPreferredProtoco
 
 
     readerslen = SCARD_AUTOALLOCATE;
-    r = SCardListReaders(*phContext, NULL, (LPSTR) readers, &readerslen);
+    r = SCardListReaders(*phContext, NULL, (LPCWSTR) readers, &readerslen);
     if (r != SCARD_S_SUCCESS) {
         fprintf(stderr, "Could not get readers\n");
         goto err;
@@ -58,7 +60,7 @@ pcsc_connect(unsigned int readernum, DWORD dwShareMode, DWORD dwPreferredProtoco
     }
 
 
-    r = SCardConnect(*phContext, reader, dwShareMode, dwPreferredProtocols,
+    r = SCardConnect(*phContext, (LPCWSTR) reader, dwShareMode, dwPreferredProtocols,
             phCard, pdwActiveProtocol); 
     if (r != SCARD_S_SUCCESS) {
         fprintf(stderr, "Could not connect to %s\n", reader);