diff --git a/src/common/compat.c b/src/common/compat.c
index ce7e00babc..a60d45a92d 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -486,7 +486,7 @@ set_socket_nonblocking(int socket)
  * type,protocol,fd), but works on systems that don't have
  * socketpair.)
  *
- * Currently, only (AF_UNIX, SOCK_STREAM, 0 ) sockets are supported.
+ * Currently, only (AF_UNIX, SOCK_STREAM, 0) sockets are supported.
  *
  * Note that on systems without socketpair, this call will fail if
  * localhost is inaccessible (for example, if the networking
@@ -507,7 +507,7 @@ tor_socketpair(int family, int type, int protocol, int fd[2])
   r = socketpair(family, type, protocol, fd);
   return r < 0 ? -errno : r;
 #elif defined(USE_BSOCKETS)
-  return bsockepair(family, type, protocol, fd);
+  return bsocketpair(family, type, protocol, fd);
 #else
     /* This socketpair does not work when localhost is down. So
      * it's really not the same thing at all. But it's close enough
diff --git a/src/or/main.c b/src/or/main.c
index a2eaeb809a..314f2bf5b2 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -538,7 +538,7 @@ conn_close_if_marked(int i)
       /* XXXX Maybe allow this to happen a certain amount per hour; it usually
        * is meaningless. */
       log_fn(severity, LD_NET, "We stalled too much while trying to write %d "
-             "bytes to addr %s.  If this happens a lot, either "
+             "bytes to address %s.  If this happens a lot, either "
              "something is wrong with your network connection, or "
              "something is wrong with theirs. "
              "(fd %d, type %s, state %d, marked at %s:%d).",