diff --git a/Spring.build b/Spring.build
index 6c1c0251..97dc8a8a 100644
--- a/Spring.build
+++ b/Spring.build
@@ -48,7 +48,7 @@ Build properties that may be set:
   <!-- change this to sync the sdk doc version generated -->
   <property name="package.version.docs" value="${package.version}" />
   <!-- make system environment variables available as NAnt properties -->
-  <sysinfo/>
+  <sysinfo failonerror="false" />
 
   <property name="project.company" value="SpringSource"/>
   <property name="project.copyright" value="Copyright 2002-2009 Spring.NET Framework Team."/>
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
index 43fa6730..6fc9cf4d 100644
--- a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
@@ -23,7 +23,9 @@
 using System.Collections;
 using System.IO;
 using NHibernate;
+#if NH_2_1
 using NHibernate.ByteCode.LinFu;
+#endif
 using NHibernate.Cfg;
 using NHibernate.Connection;
 using NHibernate.Dialect;