diff --git a/src/or/directory.c b/src/or/directory.c
index 9e0adabacb..7da5aa4312 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1507,7 +1507,8 @@ directory_handle_command_get(connection_t *conn, char *headers,
     if (deflated)
       url[url_len-2] = '\0';
     conn->fingerprint_stack = smartlist_create();
-    res = dirserv_get_routerdescs(conn->fingerprint_stack, url, &msg);
+    res = dirserv_get_routerdesc_fingerprints(conn->fingerprint_stack, url,
+                                              &msg);
 
     if (!strcmpstart(url, "/tor/server/fp/"))
       request_type = deflated?"/tor/server/fp.z":"/tor/server/fp";
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index e80c8300b9..7e118359e5 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1750,13 +1750,13 @@ dirserv_orconn_tls_done(const char *address,
 static int
 connection_dirserv_add_servers_to_outbuf(connection_t *conn)
 {
-  int fp = conn->dir_refresh_src == DIR_REFRESH_SERVER_BY_FP;
+  int by_fp = conn->dir_refresh_src == DIR_REFRESH_SERVER_BY_FP;
 
   while (smartlist_len(conn->fingerprint_stack) &&
          buf_datalen(conn->outbuf) < DIRSERV_BUFFER_MIN) {
     char *fp = smartlist_pop_last(conn->fingerprint_stack);
     signed_descriptor_t *sd = NULL;
-    if (fp) {
+    if (by_fp) {
       if (router_digest_is_me(fp)) {
         sd = &(router_get_my_routerinfo()->cache_info);
       } else {