diff --git a/golded3/gectrl.cpp b/golded3/gectrl.cpp
index e02e956..2dba8bb 100644
--- a/golded3/gectrl.cpp
+++ b/golded3/gectrl.cpp
@@ -363,7 +363,7 @@ void DoKludges(int mode, GMsg* msg, int kludges) {
       gsprintf(PRINTF_DECLARE_BUFFER(msg->msgids), "%s %08x", buf2, getMsgId());
     }
 
-    if (CFG->switches.get(usemsgid) && (AA->basetype() == "PCBOARD"))
+    if (CFG->switches.get(usemsgid) && (AA->basetype() != "PCBOARD"))
     {
       sprintf(buf, "\001MSGID: %s", msg->msgids);
       line = AddKludge(line, buf);
diff --git a/golded3/gemain.cpp b/golded3/gemain.cpp
index 0eb5e03..d9c2a31 100644
--- a/golded3/gemain.cpp
+++ b/golded3/gemain.cpp
@@ -27,7 +27,7 @@
 #include <golded.h>
 #include <gutlos.h>
 
-#if defined(_MSC_VER) && defined(_DEBUG) && defined(_M_IX86)
+#if 0 && defined(_MSC_VER) && defined(_DEBUG) && defined(_M_IX86)
 #include <memleak.h>
 
 static struct LeakFinder