diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 152930b011..a2167328c9 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -796,7 +796,7 @@ DTOOL_CONFIG=[
     ("HAVE_DX9",                       'UNDEF',                  'UNDEF'),
     ("HAVE_CHROMIUM",                  'UNDEF',                  'UNDEF'),
     ("HAVE_THREADS",                   '1',                      '1'),
-    ("SIMPLE_THREADS",                 '1',                      '1'),
+    ("SIMPLE_THREADS",                 'UNDEF',                  '1'),
     ("HAVE_AUDIO",                     '1',                      '1'),
     ("NOTIFY_DEBUG",                   'UNDEF',                  'UNDEF'),
     ("DO_PSTATS",                      'UNDEF',                  'UNDEF'),
@@ -917,7 +917,7 @@ def WriteConfigSettings():
     dtool_config={}
     prc_parameters={}
 
-    if (sys.platform == "win32"):
+    if (sys.platform == "win32") or (sys.platform == "win64"):
         for key,win,unix in DTOOL_CONFIG:
             dtool_config[key] = win
         for key,win,unix in PRC_PARAMETERS:
diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index bb00a145ad..3dff8fbaf7 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -884,10 +884,10 @@ def SdkLocateMSPlatform():
     # Doesn't work with the Express versions, so we're checking for the "atlmfc" dir, which is not in the Express 
     if (platsdk == 0 and os.path.isdir(os.path.join(GetProgramFiles(), "Microsoft Visual Studio 9\\VC\\atlmfc"))):
         platsdk = os.path.join(GetProgramFiles(), "Microsoft Visual Studio 9\\VC\\PlatformSDK")
-	//This may not be the best idea but it does give a warning
+	#This may not be the best idea but it does give a warning
     if (platsdk == 0):
         if( os.environ.has_key("WindowsSdkDir") ):
-            print "Warning: Windows SDK directory not found in registry, found in Environment variables instead"
+            WARNINGS.append("Windows SDK directory not found in registry, found in Environment variables instead")
             platsdk = os.environ["WindowsSdkDir"]
     if (platsdk != 0):
         if (not platsdk.endswith("//")):
@@ -1002,6 +1002,14 @@ def LibDirectory(opt, dir):
     LIBDIRECTORIES.append((opt, dir))
 
 def LibName(opt, name):
+    #check to see if the lib file actually exists for the thrid party library given
+    #are we a thrid party library?
+    if name.startswith("thirdparty"):
+        #does this lib exists
+        if not os.path.exists(name):
+            PkgDisable(opt)
+            WARNINGS.append(name + " not found.  Skipping Package " + opt)
+            return
     LIBNAMES.append((opt, name))
 
 def DefSymbol(opt, sym, val):