diff --git a/src/channels.py b/src/channels.py
index c872c3c..dda4bbd 100644
--- a/src/channels.py
+++ b/src/channels.py
@@ -248,7 +248,7 @@ class FakeChannel(Channel):
     def part(self, message=""):
         self.state = _States.Left
 
-    def send(self, data, *, notice=False, privmsg=False):
+    def send(self, data, **kw):
         debuglog("Would message fake channel {0}: {1!r}".format(self.name, data))
 
     def mode(self, *changes):
@@ -260,7 +260,8 @@ class FakeChannel(Channel):
 
         for change in changes:
             if isinstance(change, str):
-                modes.append(change)
+                if change.startswith(("+", "-")): # we're probably asking for the list modes otherwise
+                    modes.append(change)
             else:
                 mode, target = change
                 modes.append(mode)
diff --git a/src/users.py b/src/users.py
index 1064602..762c7a8 100644
--- a/src/users.py
+++ b/src/users.py
@@ -433,7 +433,7 @@ class FakeUser(User):
     def queue_message(self, message):
         self.send(message) # don't actually queue it
 
-    def send(self, data, *, notice=False, privmsg=False):
+    def send(self, data, **kw):
         debuglog("Would message fake user {0}: {1!r}".format(self.nick, data))
 
     @property