diff --git a/direct/src/plugin/p3dCert.cxx b/direct/src/plugin/p3dCert.cxx
index 733a10b628..1800a2f4db 100644
--- a/direct/src/plugin/p3dCert.cxx
+++ b/direct/src/plugin/p3dCert.cxx
@@ -557,7 +557,7 @@ get_text(char *header, size_t hlen, char *text, size_t tlen) {
 
   case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
     strncpy(header, "Unverified signature!", hlen);
-    snprintf(text, tlen, unknown_auth_cert_text, _friendly_name.c_str());
+    snprintf(text, tlen, unknown_auth_cert_text);
     break;
 
   case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
diff --git a/direct/src/plugin/p3dInstance.cxx b/direct/src/plugin/p3dInstance.cxx
index 6a9c2190b5..4b936a862b 100644
--- a/direct/src/plugin/p3dInstance.cxx
+++ b/direct/src/plugin/p3dInstance.cxx
@@ -740,7 +740,7 @@ get_request() {
         // to shutdown.
         _main_object->set_pyobj(NULL);
         _main_object->set_string_property("status", "stopped");
-        
+
         string message = "onpythonstop";
         string expression = _fparams.lookup_token(message);
         nout << "notify: " << message << " " << expression << "\n";
@@ -782,9 +782,12 @@ get_request() {
         }
       }
       break;
+
+    default:
+      break;
     }
   }
-  
+
   return request;
 }
 
@@ -935,6 +938,9 @@ finish_request(P3D_request *request, bool handled) {
       request->_request._forget_package._package_version = NULL;
     }
     break;
+
+  default:
+    break;
   }
 
   p3d_unref_delete(((P3DInstance *)request->_instance));
diff --git a/direct/src/plugin/p3dMainObject.cxx b/direct/src/plugin/p3dMainObject.cxx
index 2bfbda2cf8..5b49cbcf43 100644
--- a/direct/src/plugin/p3dMainObject.cxx
+++ b/direct/src/plugin/p3dMainObject.cxx
@@ -575,14 +575,14 @@ read_log(const string &log_pathname, P3D_object *params[], int num_params) {
 
   // Read matching files
   vector<string> all_logs;
-  int log_matches_found = 0; 
+  int log_matches_found = 0;
   string log_matching_pathname;
   inst_mgr->scan_directory(log_directory, all_logs);
-  for (int i=(int)all_logs.size()-1; i>=0; --i) {
-    if ((all_logs[i] == log_leafname_primary) ||
-        (all_logs[i].find(log_basename) == 0) &&
-        (all_logs[i].size() > 4) &&
-        (all_logs[i].substr(all_logs[i].size() - 4) == string(".log"))) {
+  for (int i = (int)all_logs.size() - 1; i >= 0; --i) {
+    if (all_logs[i] == log_leafname_primary ||
+        (all_logs[i].find(log_basename) == 0 &&
+         all_logs[i].size() > 4 &&
+         all_logs[i].substr(all_logs[i].size() - 4) == string(".log"))) {
       log_matches_found++;
       log_matching_pathname = (log_directory + all_logs[i]);
       read_log_file(log_matching_pathname, tail_bytes, head_bytes, log_data);
@@ -606,10 +606,10 @@ read_log(const string &log_pathname, P3D_object *params[], int num_params) {
 //  Description: The generic log-reader function.
 ////////////////////////////////////////////////////////////////////
 void P3DMainObject::
-read_log_file(const string &log_pathname, 
-              size_t tail_bytes, size_t head_bytes, 
+read_log_file(const string &log_pathname,
+              size_t tail_bytes, size_t head_bytes,
               ostringstream &log_data) {
-  
+
   // Get leaf name
   string log_leafname = log_pathname;
   size_t slash = log_leafname.rfind('/');
diff --git a/direct/src/plugin/p3dPackage.cxx b/direct/src/plugin/p3dPackage.cxx
index bc25791575..85ab9a3b21 100755
--- a/direct/src/plugin/p3dPackage.cxx
+++ b/direct/src/plugin/p3dPackage.cxx
@@ -1539,6 +1539,10 @@ download_progress() {
   assert(_package->_active_download == this);
 
   switch (_dtype) {
+  case DT_contents_file:
+  case DT_redownload_contents_file:
+    break;
+
   case DT_desc_file:
     break;
 
@@ -1581,7 +1585,7 @@ download_finished(bool success) {
         _file_spec.get_actual_file()->output_hash(nout);
         nout << "\n";
       }
-      
+
       success = false;
     }
   }
diff --git a/direct/src/plugin/p3dX11SplashWindow.cxx b/direct/src/plugin/p3dX11SplashWindow.cxx
index aaaa4c8e0a..f1afc5a15b 100755
--- a/direct/src/plugin/p3dX11SplashWindow.cxx
+++ b/direct/src/plugin/p3dX11SplashWindow.cxx
@@ -1060,7 +1060,6 @@ update_image(X11ImageData &image) {
   _needs_new_composite = true;
 
   // Go read the image.
-  string data;
   if (!read_image_data(image, image._data, image._filename)) {
     return;
   }
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 0e14d3a155..74b73ef3a4 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -4785,11 +4785,13 @@ if (RTDIST or RUNTIME):
     TargetAdd('p3dpython.exe', input='p3dpython_p3dpython_composite1.obj')
     TargetAdd('p3dpython.exe', input='p3dpython_p3dPythonMain.obj')
     TargetAdd('p3dpython.exe', input=COMMON_PANDA_LIBS)
+    TargetAdd('p3dpython.exe', input='core.pyd')
     TargetAdd('p3dpython.exe', input='libp3tinyxml.ilb')
     TargetAdd('p3dpython.exe', opts=['PYTHON', 'WINUSER'])
 
     TargetAdd('libp3dpython.dll', input='p3dpython_p3dpython_composite1.obj')
     TargetAdd('libp3dpython.dll', input=COMMON_PANDA_LIBS)
+    TargetAdd('libp3dpython.dll', input='core.pyd')
     TargetAdd('libp3dpython.dll', input='libp3tinyxml.ilb')
     TargetAdd('libp3dpython.dll', opts=['PYTHON', 'WINUSER'])
 
@@ -4801,6 +4803,7 @@ if (RTDIST or RUNTIME):
       TargetAdd('p3dpythonw.exe', input='p3dpythonw_p3dpython_composite1.obj')
       TargetAdd('p3dpythonw.exe', input='p3dpythonw_p3dPythonMain.obj')
       TargetAdd('p3dpythonw.exe', input=COMMON_PANDA_LIBS)
+      TargetAdd('p3dpythonw.exe', input='core.pyd')
       TargetAdd('p3dpythonw.exe', input='libp3tinyxml.ilb')
       TargetAdd('p3dpythonw.exe', opts=['SUBSYSTEM:WINDOWS', 'PYTHON', 'WINUSER'])