diff --git a/direct/src/plugin/p3d_lock.h b/direct/src/plugin/p3d_lock.h
index 73fa587aaf..2d46457981 100755
--- a/direct/src/plugin/p3d_lock.h
+++ b/direct/src/plugin/p3d_lock.h
@@ -45,7 +45,7 @@
 // SPAWN_THREAD call.  The wrapper will in turn call the method
 // function you provide.
 #define THREAD_CALLBACK_DECLARATION(class, callback_function) \
-  static DWORD class::                                        \
+  static DWORD WINAPI class::                                        \
   win_ ## callback_function(LPVOID data) {        \
     ((class *)data)->callback_function();       \
     return 0;                                   \
diff --git a/direct/src/plugin_npapi/ppBrowserObject.cxx b/direct/src/plugin_npapi/ppBrowserObject.cxx
index 2ee8d94aae..c7fd7396a7 100644
--- a/direct/src/plugin_npapi/ppBrowserObject.cxx
+++ b/direct/src/plugin_npapi/ppBrowserObject.cxx
@@ -185,4 +185,6 @@ get_class_definition() {
     _browser_object_class->_set_property = &object_set_property;
     _browser_object_class->_call = &object_call;
   }
+
+  return _browser_object_class;
 }