diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateAssemblyResolver.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateAssemblyResolver.cs
index 9648bcfd59..625bef9cef 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateAssemblyResolver.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateAssemblyResolver.cs
@@ -9,9 +9,13 @@ namespace ICSharpCode.AspNet.Mvc
 	[Serializable]
 	public class MvcTextTemplateAssemblyResolver : ITextTemplatingAssemblyResolver
 	{
-		public string Resolve(string assemblyReference)
+		public string ResolvePath(string assemblyReference)
 		{
 			return assemblyReference;
 		}
+		
+		public void Dispose()
+		{
+		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs
index 461032fdd4..a1ff794821 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs
@@ -22,7 +22,12 @@ namespace ICSharpCode.AspNet.Mvc
 			ITextTemplatingAppDomainFactory appDomainFactory,
 			ITextTemplatingAssemblyResolver assemblyResolver,
 			string applicationBase)
-			: base(appDomainFactory, assemblyResolver, applicationBase)
+			: this(new TextTemplatingHostContext(appDomainFactory, assemblyResolver, null, null), applicationBase)
+		{
+		}
+		
+		public MvcTextTemplateHost(TextTemplatingHostContext context, string applicationBase)
+			: base(context, applicationBase)
 		{
 			AddAssemblyReferenceForMvcHost();
 			AddImports();
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/TestableProject.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/TestableProject.cs
index eaa5350c50..c413e84fd2 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/TestableProject.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/TestableProject.cs
@@ -27,7 +27,7 @@ namespace AspNet.Mvc.Tests.Helpers
 		public static TestableProject CreateProject(string fileName, string projectName)
 		{
 			var createInfo = new ProjectCreateInformation();
-			createInfo.Solution = new Solution();
+			createInfo.Solution = new Solution(null);
 			createInfo.ProjectName = projectName;
 			createInfo.OutputProjectFileName = fileName;
 			return new TestableProject(createInfo);
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcTextTemplateAssemblyResolverTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcTextTemplateAssemblyResolverTests.cs
index 19af044d65..a82c4a0aef 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcTextTemplateAssemblyResolverTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcTextTemplateAssemblyResolverTests.cs
@@ -18,12 +18,12 @@ namespace AspNet.Mvc.Tests
 		}
 		
 		[Test]
-		public void Resolve_FullPathToAssemblyPassed_ReturnsFullPathToAssembly()
+		public void ResolvePath_FullPathToAssemblyPassed_ReturnsFullPathToAssembly()
 		{
 			CreateResolver();
 			string expectedAssemblyPath = @"d:\projects\MyProject\bin\debug\MyProject.dll";
 			
-			string resolvedAssemblyPath = resolver.Resolve(expectedAssemblyPath);
+			string resolvedAssemblyPath = resolver.ResolvePath(expectedAssemblyPath);
 			
 			Assert.AreEqual(expectedAssemblyPath, resolvedAssemblyPath);
 		}