diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 14dc56aba4..341fbc2d6c 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -173,7 +173,7 @@ connection_edge_destroy(uint16_t circ_id, connection_t *conn)
 int
 connection_edge_end(connection_t *conn, char reason, crypt_path_t *cpath_layer)
 {
-  char payload[9];
+  char payload[RELAY_PAYLOAD_SIZE];
   size_t payload_len=1;
   circuit_t *circ;
 
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 1ff17150eb..4b83bfcf84 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -570,7 +570,7 @@ _compare_tor_version_str_ptr(const void **_a, const void **_b)
     return -1;
   if (ca && !cb)
     return 1;
-  /* If neiher parses, compare strings.  Also, the directory server admin needs
+  /* If neither parses, compare strings.  Also, the directory server admin needs
   ** to be smacked upside the head.  But Tor is tolerant and gentle. */
   return strcmp(a,b);
 }