diff --git a/ChangeLog b/ChangeLog
index fb5241f3d..eaaddb69b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ Changes in version 0.2.0.6-alpha - 2007-??-??
       mean-times-between-failures. When we have 4 or more days of data,
       use measured MTBF rather than declared uptime to decide whether
       to call a router Stable. Implements proposal 108.
+
+  o Major bugfixes (load balancing):
     - When choosing nodes for non-guard positions, weight guards
       proportionally less, since they already have enough load. Patch
       from Mike Perry.
diff --git a/src/or/config.c b/src/or/config.c
index eb67bf301..37c60b657 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4359,9 +4359,9 @@ or_state_validate(or_state_t *old_state, or_state_t *state,
                "file. Proceeding anyway.", state->TorVersion);
     } else { /* take action based on v */
       if ((tor_version_as_new_as(state->TorVersion, "0.1.1.10-alpha") &&
-          !tor_version_as_new_as(state->TorVersion, "0.1.2.16-dev"))
-          || (tor_version_as_new_as(state->TorVersion, "0.2.0.0-alpha") &&
-          !tor_version_as_new_as(state->TorVersion, "0.2.0.6-alpha"))) {
+           !tor_version_as_new_as(state->TorVersion, "0.1.2.16-dev")) ||
+          (tor_version_as_new_as(state->TorVersion, "0.2.0.0-alpha") &&
+           !tor_version_as_new_as(state->TorVersion, "0.2.0.6-alpha"))) {
         log_notice(LD_CONFIG, "Detected state file from old version '%s'. "
                    "Choosing new entry guards for you.",
                    state->TorVersion);
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index ef0d6c6a3..e686aa5a6 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1320,7 +1320,7 @@ smartlist_choose_by_bandwidth(smartlist_t *sl, bandwidth_weight_rule_t rule,
   /* First count the total bandwidth weight, and make a list
    * of each value.  <0 means "unknown; no routerinfo."  We use the
    * bits of negative values to remember whether the router was fast (-x)&1
-   * and whether it was an exit (-x)&2.  Yes, it's a hack. */
+   * and whether it was an exit (-x)&2 or guard (-x)&4.  Yes, it's a hack. */
   bandwidths = tor_malloc(sizeof(int32_t)*smartlist_len(sl));
   exit_bits = bitarray_init_zero(smartlist_len(sl));
   guard_bits = bitarray_init_zero(smartlist_len(sl));