diff --git a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs
index 6bb75d27..cdc6b309 100644
--- a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs
+++ b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs
@@ -253,7 +253,6 @@ namespace Spring.Data.NHibernate
         /// </summary>
         /// <seealso cref="HibernateTemplate.EntityInterceptor"/>
         /// <seealso cref="HibernateTransactionManager.EntityInterceptor" />
-        /// <seealso cref="Configuration.Interceptor" />
         public IInterceptor EntityInterceptor
         {
             set { this.entityInterceptor = value; }
@@ -263,7 +262,6 @@ namespace Spring.Data.NHibernate
         /// Set a Hibernate NamingStrategy for the SessionFactory, determining the
         /// physical column and table names given the info in the mapping document.
         /// </summary>
-        /// <seealso cref="Configuration.NamingStrategy" />
         public INamingStrategy NamingStrategy
         {
             set { this.namingStrategy = value; }
@@ -313,10 +311,7 @@ namespace Spring.Data.NHibernate
         ///   &lt;/props&gt;
         /// &lt;/property&gt;</pre>
         /// </p>
-        /// Note that appending a cache region name (with a comma separator) is only
-        /// supported on Hibernate 3.1, where this functionality is publically available.
         /// </summary>
-        /// <seealso cref="Configuration.SetCacheConcurrencyStrategy(string, string)" />
         public Properties EntityCacheStrategies
         {
             set { this.entityCacheStrategies = value; }
@@ -335,9 +330,6 @@ namespace Spring.Data.NHibernate
         ///   &lt;/props&gt;
         /// &lt;/property&gt;</pre>
         /// </p>
-        /// Note that appending a cache region name (with a comma separator) is only
-        /// supported on Hibernate 3.1, where this functionality is publically available.
-        /// <seealso cref="Configuration.SetCollectionCacheConcurrencyStrategy(string, string)"/>
         /// </summary>
         public Properties CollectionCacheStrategies
         {
@@ -997,7 +989,7 @@ namespace Spring.Data.NHibernate
         protected virtual DataAccessException ConvertAdoAccessException(ADOException ex)
         {
 
-            string sqlString = (ex.SqlString != null) ? ex.SqlString : string.Empty;
+            string sqlString = (ex.SqlString != null) ? ex.SqlString.ToString() : string.Empty;
             return AdoExceptionTranslator.Translate(
                 "Hibernate operation: " + ex.Message, sqlString, ex.InnerException);
 
diff --git a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj
index bf01e713..87bc6616 100644
--- a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj
+++ b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E57B4652-0231-49CB-B058-87E10EFE540D}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -20,7 +20,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>Spring.Data.NHibernate21.xml</DocumentationFile>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>
     </NoWarn>
   </PropertyGroup>