diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml
index 93f28a768..c3d0942e0 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -123,6 +123,7 @@
 
                         <unzip overwrite="false" src="${tck.zip}" dest="${tck.base}" />
 
+                        <!-- FIXME - Make sure we're using the Geronimo Spec -->
                         <path id="cp">
                             <path refid="maven.compile.classpath" />
 
@@ -198,6 +199,7 @@ databaseName=${db.name}
                         <!-- convert backslashes and known paths with spaces
                             to get around a problem with the TCK testrunner 
                             on windows -->
+                        <echo>Update directory paths if running on Windows</echo>
                         <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" />
                         <concat append="true" destfile="${jpatck.config}">
                             <fileset file="${jpatck.config}.tmp" />
@@ -223,7 +225,7 @@ databaseName=${db.name}
                             persistent classes to work (like the SignatureTest)
                         -->
                         <replace file="${jpatck.config}">
-                            <replacefilter token="${JAVA_HOME}/bin/java" value="${JAVA_HOME}/bin/java -javaagent:${agent}${agent.properties} -Dopenjpa.MetaDataFactory=jpa(DefaultAccessType=PROPERTY)" />
+                            <replacefilter token="-Ddeliverable.class=${deliverable.class}" value="-Ddeliverable.class=${deliverable.class} -javaagent:${agent}${agent.properties} -Dopenjpa.MetaDataFactory=jpa(DefaultAccessType=PROPERTY)" />
                         </replace>
 
                         <!-- make a macro for the TCK harness launcher -->
@@ -265,10 +267,12 @@ databaseName=${db.name}
                         <echo>Logging JPA 2.0 TCK output to ${tck.log}</echo>
 
                         <!-- first initialize the database -->
+                        <echo>Calling TCK initdb.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />
                         <echo>TCK initdb.xml returned result=${tsant.result}</echo>
 
                         <!-- now run the TCK -->
+                        <echo>Calling TCK build.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/build.xml" target="runclient" />
                         <echo>TCK build.xml returned result=${tsant.result}</echo>
 
@@ -465,6 +469,7 @@ databaseName=${db.name}
                         <!-- convert backslashes and known paths with spaces
                             to get around a problem with the TCK testrunner 
                             on windows -->
+                        <echo>Update directory paths if running on Windows</echo>
                         <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" />
                         <concat append="true" destfile="${jpatck.config}">
                             <fileset file="${jpatck.config}.tmp" />
@@ -533,9 +538,11 @@ databaseName=${db.name}
                         <echo>Logging JPA TCK output to ${tck.log}</echo>
 
                         <!-- first initialize the database -->
+                        <echo>Calling TCK initdb.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />
 
                         <!-- now run the TCK -->
+                        <echo>Calling TCK build.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/build.xml" target="runclient" />
 
                         <!-- archive the results -->