diff --git a/Changes b/Changes
index 5d0b61a20..42923e1cb 100644
--- a/Changes
+++ b/Changes
@@ -20,6 +20,8 @@ Anope Version  S V N
 12/24 F Display error messages when RDB functions fail.                   [ #00]
 12/27 F ModuleNoticeLang was printf'ing twice.                            [#650]
 12/27 F Module (un)loading was only giving error numbers, not messages.   [#652]
+12/29 F Channel joins logged twice on some IRCd's with debug mode on.     [#651]
+12/29 F Botserv incorrectly attempted to remove bans with BSSmartJoin     [#653]
 
 Anope Version 1.7.17
 --------------------
diff --git a/src/botserv.c b/src/botserv.c
index ae02dfd42..1b6f98eb0 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -776,7 +776,8 @@ void bot_join(ChannelInfo * ci)
             av[1] = sstrdup("-b");
             for (i = 0; i < count; i++) {
                 if (match_wild_nocase(ci->c->bans[i], botmask)) {
-                    anope_cmd_mode(ci->bi->nick, ci->name, "%s", bans[i]);
+                    anope_cmd_mode(ci->bi->nick, ci->name, "-b %s",
+                                   bans[i]);
                     av[2] = sstrdup(bans[i]);
                     do_cmode(ci->bi->nick, 3, av);
                     free(av[2]);
diff --git a/src/channels.c b/src/channels.c
index 7df6c2089..3d7f8487f 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -525,8 +525,6 @@ void do_join(const char *source, int ac, char **av)
         t = s + strcspn(s, ",");
         if (*t)
             *t++ = 0;
-        if (debug)
-            alog("debug: %s joins %s", source, s);
 
         if (*s == '0') {
             c = user->chans;
diff --git a/version.log b/version.log
index 34f3f8c43..f8756bdf6 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="17"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1212"
+VERSION_BUILD="1213"
 
 # $Log$
 #
+# BUILD : 1.7.17 (1213)
+# BUGS  : 651 653
+# NOTES : Fixed channel joins being logged twice in debug mode on some IRCds and BotServ incorrectly attempting to remove bans with BSSmartJoin
+#
 # BUILD : 1.7.17 (1212)
 # BUGS  : 652
 # NOTES : Fixed handleModuleOperationQueue to also include error messages instead of only error numbers