diff --git a/Engine/source/T3D/sfx/sfxEmitter.cpp b/Engine/source/T3D/sfx/sfxEmitter.cpp
index 8ac0de6ad..59215acb4 100644
--- a/Engine/source/T3D/sfx/sfxEmitter.cpp
+++ b/Engine/source/T3D/sfx/sfxEmitter.cpp
@@ -690,7 +690,7 @@ void SFXEmitter::_update()
 
    if (mSoundAsset.notNull() )
    {
-      mLocalProfile = *mSoundAsset->getSfxProfile();
+      //mLocalProfile = *mSoundAsset->getSfxProfile();
       mDescription = *mSoundAsset->getSfxDescription();
    }
 
diff --git a/Engine/source/Verve/VPath/VPathEditor.cpp b/Engine/source/Verve/VPath/VPathEditor.cpp
index f135e75de..670ab6b0f 100644
--- a/Engine/source/Verve/VPath/VPathEditor.cpp
+++ b/Engine/source/Verve/VPath/VPathEditor.cpp
@@ -20,6 +20,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#include "torqueConfig.h"
+
 #ifdef TORQUE_TOOLS
 #include "VPathEditor.h"
 
diff --git a/Engine/source/Verve/VPath/VPathEditor.h b/Engine/source/Verve/VPath/VPathEditor.h
index 6005e54f6..9b98af686 100644
--- a/Engine/source/Verve/VPath/VPathEditor.h
+++ b/Engine/source/Verve/VPath/VPathEditor.h
@@ -22,6 +22,8 @@
 //-----------------------------------------------------------------------------
 #ifndef _VT_VPATHEDITOR_H_
 #define _VT_VPATHEDITOR_H_
+
+#include "torqueConfig.h"
 #ifdef TORQUE_TOOLS
 #ifndef _EDITTSCTRL_H_
 #include "gui/worldEditor/editTSCtrl.h"
diff --git a/Engine/source/afx/ui/afxGuiSubstitutionField.cpp b/Engine/source/afx/ui/afxGuiSubstitutionField.cpp
index 9156181f0..4ee573c37 100644
--- a/Engine/source/afx/ui/afxGuiSubstitutionField.cpp
+++ b/Engine/source/afx/ui/afxGuiSubstitutionField.cpp
@@ -22,6 +22,7 @@
 // IN THE SOFTWARE.
 //
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#include "torqueConfig.h"
 #ifdef TORQUE_TOOLS
 #include "afx/arcaneFX.h"
 
diff --git a/Engine/source/afx/ui/afxGuiSubstitutionField.h b/Engine/source/afx/ui/afxGuiSubstitutionField.h
index c92217afe..d26218be9 100644
--- a/Engine/source/afx/ui/afxGuiSubstitutionField.h
+++ b/Engine/source/afx/ui/afxGuiSubstitutionField.h
@@ -25,6 +25,7 @@
 
 #ifndef _AFX_GUI_SUBSTITUTION_FIELD_H_
 #define _AFX_GUI_SUBSTITUTION_FIELD_H_
+#include "torqueConfig.h"
 #ifdef TORQUE_TOOLS
 #include "console/simFieldDictionary.h"
 #include "gui/editor/inspector/field.h"
diff --git a/Engine/source/assets/assetManager.cpp b/Engine/source/assets/assetManager.cpp
index c1e3929c6..557520f79 100644
--- a/Engine/source/assets/assetManager.cpp
+++ b/Engine/source/assets/assetManager.cpp
@@ -2988,7 +2988,8 @@ void AssetManager::unloadAsset( AssetDefinition* pAssetDefinition )
     PROFILE_SCOPE(AssetManager_UnloadAsset);
 
     // Destroy the asset.
-    pAssetDefinition->mpAssetBase->deleteObject();
+    if(pAssetDefinition->mpAssetBase->isProperlyAdded())
+      pAssetDefinition->mpAssetBase->deleteObject();
 
     // Increase unloaded count.
     pAssetDefinition->mAssetUnloadedCount++;
diff --git a/Engine/source/navigation/guiNavEditorCtrl.cpp b/Engine/source/navigation/guiNavEditorCtrl.cpp
index a951988eb..1847fa60e 100644
--- a/Engine/source/navigation/guiNavEditorCtrl.cpp
+++ b/Engine/source/navigation/guiNavEditorCtrl.cpp
@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#include "torqueConfig.h"
 #ifdef TORQUE_TOOLS
 #include "platform/platform.h"
 #include "guiNavEditorCtrl.h"
diff --git a/Engine/source/navigation/guiNavEditorCtrl.h b/Engine/source/navigation/guiNavEditorCtrl.h
index af91c856b..4d795f459 100644
--- a/Engine/source/navigation/guiNavEditorCtrl.h
+++ b/Engine/source/navigation/guiNavEditorCtrl.h
@@ -22,6 +22,7 @@
 
 #ifndef _GUINAVEDITORCTRL_H_
 #define _GUINAVEDITORCTRL_H_
+#include "torqueConfig.h"
 #ifdef TORQUE_TOOLS
 #ifndef _EDITTSCTRL_H_
 #include "gui/worldEditor/editTSCtrl.h"
diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
index 22cdd4be1..85566310d 100644
--- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
+++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
@@ -1090,14 +1090,17 @@ function AssetBrowserPreviewButton::onRightClick(%this)
       EditAssetPopup.enableItem(9, false);
    }
    
-   %assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
-   if(%assetDef.originalFilePath $= "" || !isFile(%assetDef.originalFilePath))
+   if(AssetDatabase.acquireAsset(EditAssetPopup.assetId))
    {
-      //if we have no noted original import file path or it's invalid
-      //we can't reimport either
-      EditAssetPopup.enableItem(9, false);
+      %assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
+      if(%assetDef.originalFilePath $= "" || !isFile(%assetDef.originalFilePath))
+      {
+         //if we have no noted original import file path or it's invalid
+         //we can't reimport either
+         EditAssetPopup.enableItem(9, false);
+      }
+      AssetDatabase.releaseAsset(EditAssetPopup.assetId);
    }
-   AssetDatabase.releaseAsset(EditAssetPopup.assetId);
    
    if(%assetType $= "LevelAsset")
    {
diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript
index fe2644c4a..c9735fa58 100644
--- a/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript
+++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript
@@ -33,6 +33,17 @@ function AssetBrowser::editAsset(%this, %assetDef)
          {
             AssetBrowser.navigateTo(%folder);
          }
+         else
+         {
+            %object = getToken(EditAssetPopup.assetId, ":", 1);
+            if(isObject(%object))
+            {
+               if(%object.isMemberOfClass("SimDatablock"))
+               {
+                  DatablockEditorPlugin.openDatablock( %object );
+               }
+            }
+         }
       }
    }
    else if(AssetDatabase.isDeclaredAsset(%assetDef))
@@ -42,12 +53,14 @@ function AssetBrowser::editAsset(%this, %assetDef)
       %assetDef = AssetDatabase.acquireAsset(%assetDef);
    }
       
+   if(%assetDef !$= "")
+   {
+      %assetType = %assetDef.getClassName();
       
-   %assetType = %assetDef.getClassName();
-   
-   //Build out the edit command
-   %buildCommand = %this @ ".edit" @ %assetType @ "(" @ %assetDef @ ");";
-   eval(%buildCommand);
+      //Build out the edit command
+      %buildCommand = %this @ ".edit" @ %assetType @ "(" @ %assetDef @ ");";
+      eval(%buildCommand);
+   }
 }
 
 function AssetBrowser::appendSubLevel(%this)