diff --git a/MaxNifTools.ini b/MaxNifTools.ini
index a9223aea0ebaa32719cf4234f30068397d5d27fb..d734959aa993c3b78c9aedd83bffa99b358a15ab 100644
--- a/MaxNifTools.ini
+++ b/MaxNifTools.ini
@@ -8,7 +8,7 @@ MaxSDKVersion=0
 ShortDescription=Netimmerse/Gamebryo
 ; KnownApplications - Used to indicate which sections in the ini file point 
 ;    to "Applications" which have their own settings in a section below.
-KnownApplications=Oblivion;Morrowind;Civilization 4;Dark Age of Camelot;Freedom Force;Freedom Force vs. the 3rd Reich;Star Trek: Bridge Commander;Loki;User
+KnownApplications=Oblivion;Morrowind;Civilization 4;Dark Age of Camelot;Freedom Force;Freedom Force vs. the 3rd Reich;Star Trek: Bridge Commander;Loki;Imagine;Emerge;User
 ; Reparse the Applications (and therefore Texture directory cache) on every import/export
 Reparse=0
 ; Website - Primary website
@@ -292,6 +292,29 @@ TextureExtensions=.tga;.dds
 TextureSearchPaths=${TextureRootPaths}
 TextureUseFullPath=-1
 
+
+[Imagine]
+NiVersion=20.3.0.6
+NiUserVersion=0
+InstallPath=[HKLM\SOFTWARE\MEGAMITENSEI IMAGINE]
+RootPath=${InstallPath}
+RootPaths=${InstallPath}
+TextureRootPaths=${InstallPath}
+TextureExtensions=.tga;.dds
+TextureSearchPaths=${InstallPath}
+TextureUseFullPath=-1
+
+[Emerge]
+NiVersion=20.3.0.6
+NiUserVersion=0
+InstallPath=[HKLM\SOFTWARE\Emergent\Emerge]=@"Path"
+RootPath=${InstallPath}
+RootPaths=${InstallPath}
+TextureRootPaths=${InstallPath}
+TextureExtensions=.tga;.dds
+TextureSearchPaths=${InstallPath}
+TextureUseFullPath=-1
+
 [User]
 NiVersion=20.0.0.5
 NiUserVersion=0
diff --git a/NifCommon/niutils.cpp b/NifCommon/niutils.cpp
index 889e17f51b3375cc1c9af840837aed417a2c11de..33da10f9ddc2f19dd1c812f7d547f944c016bd51 100644
--- a/NifCommon/niutils.cpp
+++ b/NifCommon/niutils.cpp
@@ -349,6 +349,8 @@ string GetIndirectValue(LPCSTR path)
          if (*valueName == '\"' || *valueName == '\'') ++valueName;
          if (*end == '\"' || *end == '\'') *end-- = 0;
          Trim(valueName);
+		 if (strlen(valueName) == 0)
+			 valueName = NULL;
 
          LPTSTR keyEnd = _tcschr(p, '\\');
          if (keyEnd != NULL) {
diff --git a/NifPlugins_VC80.vcproj b/NifPlugins_VC80.vcproj
index 4c901d8793ac3350ac7f39fc923227f41ce81d71..21f6459073622bf2850ff9e9a2dd97c5f35c6b58 100644
--- a/NifPlugins_VC80.vcproj
+++ b/NifPlugins_VC80.vcproj
@@ -1711,7 +1711,7 @@
 				Optimization="0"
 				InlineFunctionExpansion="0"
 				AdditionalIncludeDirectories="C:\3dsmax9\maxsdk\include;..\niflib\include;..\niflib;.\NifCommon"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;USE_NIFLIB_TEMPLATE_HELPERS;_USE_MATH_DEFINES;USE_UNSUPPORTED_CODE;USE_BIPED;NIFLIB_STATIC_LINK"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;USE_NIFLIB_TEMPLATE_HELPERS;_USE_MATH_DEFINES;USE_UNSUPPORTED_CODE;USE_BIPED;NIFLIB_STATIC_LINK;_SCL_SECURE_NO_WARNINGS"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"