diff --git a/direct/src/plugin_npapi/ppBrowserObject.cxx b/direct/src/plugin_npapi/ppBrowserObject.cxx
index 467a7b50eb..850d2020c1 100644
--- a/direct/src/plugin_npapi/ppBrowserObject.cxx
+++ b/direct/src/plugin_npapi/ppBrowserObject.cxx
@@ -230,10 +230,10 @@ call(const string &method_name, P3D_object *params[], int num_params) const {
 ////////////////////////////////////////////////////////////////////
 P3D_object *PPBrowserObject::
 eval(const string &expression) const {
-  NPString npexpr = { expression.c_str(), expression.length() };
+  NPString npexpr = { expression.c_str(), (uint32_t)expression.length() };
 
   NPVariant result;
-  if (!browser->evaluate(_instance->get_npp_instance(), _npobj, 
+  if (!browser->evaluate(_instance->get_npp_instance(), _npobj,
                          &npexpr, &result)) {
     // Failed to eval.
     return NULL;
diff --git a/direct/src/plugin_npapi/ppInstance.cxx b/direct/src/plugin_npapi/ppInstance.cxx
index aa247a644c..868534a794 100644
--- a/direct/src/plugin_npapi/ppInstance.cxx
+++ b/direct/src/plugin_npapi/ppInstance.cxx
@@ -2173,16 +2173,16 @@ set_failed() {
       NPObject *window_object = NULL;
       if (browser->getvalue(_npp_instance, NPNVWindowNPObject,
                             &window_object) == NPERR_NO_ERROR) {
-        NPString npexpr = { expression.c_str(), expression.length() };
+        NPString npexpr = { expression.c_str(), (uint32_t)expression.length() };
         NPVariant result;
-        if (browser->evaluate(_npp_instance, window_object, 
+        if (browser->evaluate(_npp_instance, window_object,
                               &npexpr, &result)) {
           nout << "Eval " << expression << "\n";
           browser->releasevariantvalue(&result);
         } else {
           nout << "Unable to eval " << expression << "\n";
         }
-        
+
         browser->releaseobject(window_object);
       }
     }
diff --git a/direct/src/plugin_npapi/startup.cxx b/direct/src/plugin_npapi/startup.cxx
index cf8fb6db9f..1d2a33b82b 100644
--- a/direct/src/plugin_npapi/startup.cxx
+++ b/direct/src/plugin_npapi/startup.cxx
@@ -187,7 +187,7 @@ NP_Initialize(NPNetscapeFuncs *browserFuncs,
   }
 #endif
 
-  int browser_major = (browser->version >> 8) && 0xff;
+  int browser_major = (browser->version >> 8) & 0xff;
   int browser_minor = browser->version & 0xff;
   nout << "Browser NPAPI version " << browser_major << "." << browser_minor << "\n";
 
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index b787a9b870..6d419839f3 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -439,6 +439,10 @@ if (RTDIST and DISTRIBUTOR == "cmu"):
 elif RTDIST and not HOST_URL:
     exit("You must specify a host URL when building the rtdist!")
 
+if RUNTIME and not HOST_URL:
+    # Set this to a nice default.
+    HOST_URL = "https://runtime.panda3d.org/"
+
 ########################################################################
 ##
 ## Choose a Compiler.
diff --git a/panda/src/dxml/tinyxml.h b/panda/src/dxml/tinyxml.h
index 562a4efc84..09337188fb 100644
--- a/panda/src/dxml/tinyxml.h
+++ b/panda/src/dxml/tinyxml.h
@@ -26,6 +26,8 @@ distribution.
 #ifndef TINYXML_INCLUDED
 #define TINYXML_INCLUDED
 
+#include "pandasymbols.h"
+
 #ifdef _MSC_VER
 #pragma warning( push )
 #pragma warning( disable : 4530 )