diff --git a/build/make.py b/build/make.py
index 0e5097d3..e56f002e 100644
--- a/build/make.py
+++ b/build/make.py
@@ -43,16 +43,16 @@ def niraicall_obfuscate(code):
 
 niraimarshal.niraicall_obfuscate = niraicall_obfuscate
 
-class StridePackager(NiraiPackager, configPath=None):
+class StridePackager(NiraiPackager):
     HEADER = 'TTSTRIDE'
     BASEDIR = '..' + os.sep
 
-    def __init__(self, outfile):
+    def __init__(self, outfile, configPath=None):
         NiraiPackager.__init__(self, outfile)
         self.__manglebase = self.get_mangle_base(self.BASEDIR)
         self.add_panda3d_dirs()
         self.add_default_lib()
-        self.globalConfigPath = configPath if configPath is not None else '../dependencies/config/release/qa.prc'
+        self.globalConfigPath = configPath
 
     def add_source_dir(self, dir):
         self.add_directory(self.BASEDIR + dir, mangler=self.__mangler)
@@ -71,8 +71,11 @@ class StridePackager(NiraiPackager, configPath=None):
 
     def generate_niraidata(self):
         print 'Generating niraidata'
-        config = self.get_file_contents('../dependencies/config/general.prc')
-        config += '\n\n' + self.get_file_contents(self.globalConfigPath)
+        if self.globalConfigPath is not None:
+            config = self.get_file_contents(self.globalConfigPath)
+        else:
+            config = self.get_file_contents('../dependencies/config/general.prc')
+            config += '\n\n' + self.get_file_contents('../dependencies/config/release/qa.prc')
 
         config_iv = self.generate_key(16)
         config_key = self.generate_key(16)
diff --git a/build/nirai/panda3d b/build/nirai/panda3d
index 510b6b2b..e4743737 160000
--- a/build/nirai/panda3d
+++ b/build/nirai/panda3d
@@ -1 +1 @@
-Subproject commit 510b6b2b3fef1674611e4666b45db949868a8869
+Subproject commit e4743737b0572feab80a08959f2b4d865ab3bc62
diff --git a/build/nirai/src b/build/nirai/src
index 93697776..3d29188a 160000
--- a/build/nirai/src
+++ b/build/nirai/src
@@ -1 +1 @@
-Subproject commit 936977760bfac218f634533dd4d926ad7e8e2092
+Subproject commit 3d29188a91b658f61cd2c3b3b8ada23050d4f230