diff --git a/trunk/src/common/crypto.c b/trunk/src/common/crypto.c
index 1692aac23a..dfed70850c 100644
--- a/trunk/src/common/crypto.c
+++ b/trunk/src/common/crypto.c
@@ -1189,7 +1189,7 @@ static void init_dh_param() {
   dh_param_g = g;
 }
 
-/** Allocate and return a new DH object for a key echange.
+/** Allocate and return a new DH object for a key exchange.
  */
 crypto_dh_env_t *crypto_dh_new()
 {
diff --git a/trunk/src/common/fakepoll.c b/trunk/src/common/fakepoll.c
index f23c20e652..52359fb27c 100644
--- a/trunk/src/common/fakepoll.c
+++ b/trunk/src/common/fakepoll.c
@@ -42,7 +42,7 @@
 int
 tor_poll(struct pollfd *ufds, unsigned int nfds, int timeout)
 {
-        int i;
+        unsigned int i;
         for (i=0;i<nfds;++i) {
                 tor_assert(ufds[i].fd >= 0);
         }