diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
index d3d5bb5c1..811f74397 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
@@ -529,7 +529,7 @@ public class StarTeamCheckout extends TreeBasedTask {
                 log("Checking out: " + describeCheckout(eachFile));
                 break;
             default:
-                if (isForced()) {
+                if (isForced() && fileStatus != Status.CURRENT) {
                     log("Forced checkout of "
                         + describeCheckout(eachFile)
                         + " over status " + Status.name(fileStatus));
@@ -550,7 +550,7 @@ public class StarTeamCheckout extends TreeBasedTask {
                     }
                 }
                 eachFile.checkout(this.lockStatus,
-                                 !this.useRepositoryTimeStamp, this.convertEOL, true);
+                                 !this.useRepositoryTimeStamp, this.convertEOL, false);
             }
         }
     }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
index 57e0609bd..5ab019505 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
@@ -574,7 +574,8 @@ public abstract class TreeBasedTask extends StarTeamTask {
                 String[] props = new String[] {pn.FILE_NAME, pn.FILE_PATH,
                                                pn.FILE_STATUS, pn.MODIFIED_TIME,
                                                pn.FILE_FILE_TIME_AT_CHECKIN,
-                                               pn.MODIFIED_USER_ID, pn.FILE_SIZE};
+                                               pn.MODIFIED_USER_ID, pn.FILE_SIZE,
+                                               pn.FILE_ENCODING};
 
                 int depth = this.isRecursive() ? -1 : 0;
                 starteamrootfolder.populateNow(getServer().getTypeNames().FILE,