diff --git a/lib/multi.c b/lib/multi.c
index c3463b0ce..92bf28151 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -82,7 +82,7 @@ typedef enum {
 
 struct socketstate {
   curl_socket_t socks[MAX_SOCKSPEREASYHANDLE];
-  long action; /* socket action bitmap */
+  unsigned int action; /* socket action bitmap */
 };
 
 struct Curl_one_easy {
@@ -185,7 +185,7 @@ struct Curl_sh_entry {
 /* bits for 'action' having no bits means this socket is not expecting any
    action */
 #define SH_READ  1
-#define SG_WRITE 2
+#define SH_WRITE 2
 
 /* make sure this socket is present in the hash for this handle */
 static int sh_addentry(struct curl_hash *sh,
diff --git a/lib/url.c b/lib/url.c
index e9fa81168..be6c99dc2 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1950,7 +1950,8 @@ static int handleSock4Proxy(const char *proxy_name, struct connectdata *conn)
   {
     ssize_t actualread;
     ssize_t written;
-    int packetsize = 9 + strlen((char*)socksreq + 8); /* size including NUL */
+    int packetsize = 9 +
+      (int)strlen((char*)socksreq + 8); /* size including NUL */
 
     /* Send request */
     code = Curl_write(conn, sock, (char *)socksreq, packetsize, &written);
diff --git a/lib/urldata.h b/lib/urldata.h
index 8e47a6543..b2cdd8dcb 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -881,7 +881,7 @@ struct UrlState {
      set, it holds an allocated connection. */
   struct connectdata **connects;
   long numconnects; /* size of the 'connects' array */
-  int lastconnect;  /* index of most recent connect or -1 if undefined */
+  long lastconnect;  /* index of most recent connect or -1 if undefined */
 
   char *headerbuff; /* allocated buffer to store headers in */
   size_t headersize;   /* size of the allocation */