diff --git a/build/ant.bat b/build/ant.bat
index 14c97c382..365e9c4a8 100644
--- a/build/ant.bat
+++ b/build/ant.bat
@@ -23,14 +23,14 @@ rem //------------------------------------------------------------------------//
 rem // Make the correct classpath (should include the java jars and the
 rem // Ant jars)
 rem //------------------------------------------------------------------------//
-SET CP=%JAVA_HOME%\lib\tools.jar;.\ant.jar;.\junit.jar
+SET CP="%JAVA_HOME%\lib\tools.jar;.\ant.jar;.\junit.jar"
 
 rem //------------------------------------------------------------------------//
 rem // Run Ant
 rem // Note for Win 98/95 users: You need to change "%*" in the following
 rem // line to be "%1 %2 %3 %4 %5 %6 %7 %8 %9"
 rem //------------------------------------------------------------------------//
-%JAVA_HOME%\bin\java -Xms32m -Xmx128m -classpath %CP% -Dant.home=. org.apache.tools.ant.Main %*
+"%JAVA_HOME%\bin\java" -Xms32m -Xmx128m -classpath %CP% -Dant.home=. org.apache.tools.ant.Main %*
 goto end
 
 rem //------------------------------------------------------------------------//
diff --git a/build/projects/Smack.iml b/build/projects/Smack.iml
index 632545a53..41e9e7ce2 100644
--- a/build/projects/Smack.iml
+++ b/build/projects/Smack.iml
@@ -8,7 +8,7 @@
     <content url="file://$MODULE_DIR$/../..">
       <sourceFolder url="file://$MODULE_DIR$/../resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../source" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -86,5 +86,9 @@
     </orderEntry>
     <orderEntryProperties />
   </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ACTIVE_VCS_NAME" value="svn" />
+    <option name="USE_PROJECT_VCS" value="false" />
+  </component>
 </module>