diff --git a/doc/TODO b/doc/TODO
index 08c2d716c7..71fead7a75 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -234,7 +234,8 @@ Things we'd like to do in 0.2.0.x:
       trim down a lot.
   o Deprecations:
     o Remove v0 control protocol.
-P  - Packaging:
+    - can we deprecate 'getinfo network-status'?
+P - Packaging:
 P   - Can we switch to polipo? (Jun 1)
 P   - If we haven't replaced privoxy, lock down its configuration in all
       packages, as documented in tor-doc-unix.html
diff --git a/src/common/tortls.c b/src/common/tortls.c
index f232bf19da..a851f8f3af 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -25,7 +25,7 @@ const char tortls_c_id[] =
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
 
-#define CRYPTO_PRIVATE
+#define CRYPTO_PRIVATE /* to import prototypes from crypto.h */
 
 #include "./crypto.h"
 #include "./tortls.h"
diff --git a/src/or/main.c b/src/or/main.c
index 08abe77337..d87dd7fecf 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -910,7 +910,7 @@ run_scheduled_events(time_t now)
    * (if we've passed our internal checks). */
   if (time_to_fetch_directory < now) {
     /* Only caches actually need to fetch directories now. */
-    if (options->DirPort && !options->V1AuthoritativeDir) {
+    if (options->DirPort && !authdir_mode_v1(options)) {
       /* XXX actually, we should only do this if we want to advertise
        * our dirport. not simply if we configured one. -RD */
       if (any_trusted_dir_is_v1_authority())
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index ebc84eb2c0..aad37c00e8 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -233,8 +233,8 @@ rend_get_service_id(crypto_pk_env_t *pk, char *out)
 
 /* ==== Rendezvous service descriptor cache. */
 
-/** How old do we let hidden service descriptors get discarding them as too
- * old? */
+/** How old do we let hidden service descriptors get before discarding
+ * them as too old? */
 #define REND_CACHE_MAX_AGE (2*24*60*60)
 /** How wrong do we assume our clock may be when checking whether hidden
  * services are too old or too new? */