diff -dur cvc3-2.1.ORIG/java/include/cvc3/JniUtils.h cvc3-2.1/java/include/cvc3/JniUtils.h
--- cvc3-2.1.ORIG/java/include/cvc3/JniUtils.h	2008-12-12 15:48:14.000000000 -0700
+++ cvc3-2.1/java/include/cvc3/JniUtils.h	2009-10-19 11:22:57.817991587 -0600
@@ -168,7 +168,7 @@
 	env->FindClass("java/lang/Object"),
 	NULL);
 
-    for (int i = 0; i < v.size(); ++i) {
+    for (unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, embed_copy<T>(env, v[i]));
     }
 
@@ -182,7 +182,7 @@
 	env->FindClass("java/lang/Object"),
 	NULL);
 
-    for (int i = 0; i < v.size(); ++i) {
+    for (unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, embed_const_ref<T>(env, &v[i]));
     }
 
diff -dur cvc3-2.1.ORIG/java/src/cvc3/JniUtils.cpp cvc3-2.1/java/src/cvc3/JniUtils.cpp
--- cvc3-2.1.ORIG/java/src/cvc3/JniUtils.cpp	2008-10-01 12:35:31.000000000 -0600
+++ cvc3-2.1/java/src/cvc3/JniUtils.cpp	2009-10-19 11:22:17.203023038 -0600
@@ -74,6 +74,9 @@
     case PRESENTATION_LANG: return toJava(env, "PRESENTATION");
     case SMTLIB_LANG: return toJava(env, "SMTLIB");
     case LISP_LANG: return toJava(env, "LISP");
+    case AST_LANG: return toJava(env, "AST");
+    case SIMPLIFY_LANG: return toJava(env, "SIMPLIFY");
+    case TPTP_LANG: return toJava(env, "TPTP");
     }
     
     DebugAssert(false, "JniUtils::toJava(InputLanguage): unreachable");
@@ -155,7 +158,7 @@
 	env->FindClass("java/lang/String"),
 	env->NewStringUTF(""));
 
-    for(int i = 0; i < v.size(); ++i) {
+    for(unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, toJava(env, v[i]));
     }
 
diff -dur cvc3-2.1.ORIG/java/src/cvc3/ValidityChecker_impl.cpp cvc3-2.1/java/src/cvc3/ValidityChecker_impl.cpp
--- cvc3-2.1.ORIG/java/src/cvc3/ValidityChecker_impl.cpp	2009-09-30 12:54:35.000000000 -0600
+++ cvc3-2.1/java/src/cvc3/ValidityChecker_impl.cpp	2009-10-19 11:22:17.203023038 -0600
@@ -584,11 +584,11 @@
 return embed_copy(env, vc->forallExpr(vars, *body));
 
 DEFINITION: Java_cvc3_ValidityChecker_jniForallExpr2
-jobject m ValidityChecker vc cv Expr vars c Expr body cv Expr triggers
+jobject m ValidityChecker vc cv Expr vars c Expr body cvv Expr triggers
 return embed_copy(env, vc->forallExpr(vars, *body, triggers));
 
 DEFINITION: Java_cvc3_ValidityChecker_jniSetTriggers
-void m ValidityChecker vc c Expr closure cv Expr triggers
+void m ValidityChecker vc c Expr closure cvv Expr triggers
 vc->setTriggers(*closure, triggers);
 
 DEFINITION: Java_cvc3_ValidityChecker_jniExistsExpr