diff --git a/Spring.build b/Spring.build
index 4070e098..45452020 100644
--- a/Spring.build
+++ b/Spring.build
@@ -1521,6 +1521,7 @@ if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy
       <include name="test/Spring/Spring.Services.Tests/**"/>
       <include name="test/Spring/Spring.Data.Tests/**"/>
       <include name="test/Spring/Spring.Data.Integration.Tests/**"/>
+      <include name="test/Spring/Spring.Data.NHibernate.Tests/**"/>
       <include name="test/Spring/Spring.Data.NHibernate.Integration.Tests/**"/>
       <include name="test/Spring/Spring.Data.NHibernate20.Tests/**"/>
       <include name="test/Spring/Spring.Data.NHibernate20.Integration.Tests/**"/>
diff --git a/doc/reference/src/vsnet.xml b/doc/reference/src/vsnet.xml
index f802437e..e0c74727 100644
--- a/doc/reference/src/vsnet.xml
+++ b/doc/reference/src/vsnet.xml
@@ -205,7 +205,7 @@
     <orderedlist>
       <listitem>
         <para>Add the registry key
-        <literal>[HKEY_CURRENT_USER\SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\MyAssemblies]</literal>
+        <literal>[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\MyAssemblies]</literal>
         and set the value to be the directory
         <literal>&lt;spring.net-install-directory\bin\net\2.0</literal></para>
       </listitem>
diff --git a/src/Spring/Spring.Core/Spring.Core.2005.csproj b/src/Spring/Spring.Core/Spring.Core.2005.csproj
index ec0eca81..65f7088f 100644
--- a/src/Spring/Spring.Core/Spring.Core.2005.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2005.csproj
@@ -1177,7 +1177,9 @@
     <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.1.xsd">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.3.xsd" />
+    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.3.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <None Include="Objects\Factory\Xml\spring-objects-1.3.xsx">
       <DependentUpon>spring-objects-1.3.xsd</DependentUpon>
     </None>
diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2005.csproj b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2005.csproj
index 54849fd8..b55c90bf 100644
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2005.csproj
+++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2005.csproj
@@ -120,9 +120,9 @@
     <Compile Include="Messaging\Ems\Support\EmsUtils.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Messaging\Ems\Config\spring-ems-1.2.xsd">
+    <None Include="Messaging\Ems\Config\spring-ems-1.3.xsd">
       <SubType>Designer</SubType>
-    </EmbeddedResource>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.