diff --git a/lib/file.c b/lib/file.c
index dbfe81cfa5..8926105e93 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -230,11 +230,11 @@ static CURLcode file_upload(struct connectdata *conn)
     if(res)
       break;
 
-    nread = (size_t)readcount;
-
-    if (nread <= 0)
+    if (readcount <= 0)
       break;
 
+    nread = (size_t)readcount;
+
     /* write the data to the target */
     nwrite = fwrite(buf, 1, nread, fp);
     if(nwrite != nread) {
diff --git a/lib/parsedate.c b/lib/parsedate.c
index 52684825f1..864231b0e7 100644
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -391,7 +391,7 @@ static time_t Curl_parsedate(const char *date)
   t = mktime(&tm);
 
   /* time zone adjust */
-  if(-1 != t) {
+  if(-1 != (int)t) {
     struct tm *gmt;
     long delta;
     time_t t2;