diff --git a/user/src/com/google/gwt/user/server/rpc/XsrfProtectedServiceServlet.java b/user/src/com/google/gwt/user/server/rpc/XsrfProtectedServiceServlet.java
index 6aa33a4..0986340 100644
--- a/user/src/com/google/gwt/user/server/rpc/XsrfProtectedServiceServlet.java
+++ b/user/src/com/google/gwt/user/server/rpc/XsrfProtectedServiceServlet.java
@@ -96,7 +96,7 @@
     Cookie sessionCookie = Util.getCookie(getThreadLocalRequest(),
         sessionCookieName, false);
     if (sessionCookie == null || sessionCookie.getValue() == null ||
-        sessionCookie.getValue().isEmpty()) {
+        sessionCookie.getValue().length() == 0) {
       throw new RpcTokenException("Session cookie is missing or empty! " +
           "Unable to verify XSRF cookie");
     }
diff --git a/user/src/com/google/gwt/user/server/rpc/XsrfTokenServiceServlet.java b/user/src/com/google/gwt/user/server/rpc/XsrfTokenServiceServlet.java
index 48a4c86..dc631ca 100644
--- a/user/src/com/google/gwt/user/server/rpc/XsrfTokenServiceServlet.java
+++ b/user/src/com/google/gwt/user/server/rpc/XsrfTokenServiceServlet.java
@@ -190,7 +190,7 @@
     Cookie sessionCookie = Util.getCookie(getThreadLocalRequest(),
         sessionCookieName, false);
     if (sessionCookie == null || sessionCookie.getValue() == null ||
-        sessionCookie.getValue().isEmpty()) {
+        sessionCookie.getValue().length() == 0) {
       throw new RpcTokenException("Session cookie is not set or empty! " +
           "Unable to generate XSRF cookie");
     }
diff --git a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
index cc468bb..18848df 100644
--- a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
+++ b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
@@ -495,10 +495,9 @@
     // .setConstrained(true)
     sw.println(".setConstrained(" + beanDescriptor.isBeanConstrained() + ")");
 
-    int count = 0;
-    for (ConstraintDescriptor<? extends Annotation> constraint : beanDescriptor.getConstraintDescriptors()) {
+    for (int count = 0; count < beanDescriptor.getConstraintDescriptors().size(); count++) {
       // .add(c0)
-      sw.println(".add(" + constraintDescriptorVar("this", count++) + ")");
+      sw.println(".add(" + constraintDescriptorVar("this", count) + ")");
     }
 
     // .put("myProperty", myProperty_pd)