diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
index 325f7f9ccf..726e808c17 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
@@ -52,7 +52,9 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
 
         private void SetupScene(bool reuseTextures)
         {
-            m_scene = new SceneHelpers().SetupScene();
+            
+            TestsAssetCache cache = new TestsAssetCache();
+            m_scene = new SceneHelpers(cache).SetupScene();
 
             m_dtm = new DynamicTextureModule();
             m_dtm.ReuseTextures = reuseTextures;
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 6a332dcb35..1dce4a655c 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Services.GridService
 
             string assetService = gridConfig.GetString("AssetService", string.Empty);
 
-            Object[] args = new Object[] { config };
+            object[] args = new object[] { config };
 
             if (assetService != string.Empty)
                 m_AssetService = ServerUtils.LoadPlugin<IAssetService>(assetService, args);
@@ -92,7 +92,7 @@ namespace OpenSim.Services.GridService
             if (scope != string.Empty)
                 UUID.TryParse(scope, out m_ScopeID);
 
-//                m_Check4096 = gridConfig.GetBoolean("Check4096", true);
+            //m_Check4096 = gridConfig.GetBoolean("Check4096", true);
 
             m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");