diff --git a/src/xmpp/client.go b/src/xmpp/client.go
index f53315c..36ae46b 100644
--- a/src/xmpp/client.go
+++ b/src/xmpp/client.go
@@ -276,3 +276,6 @@ type saslFailure struct {
 	XMLName xml.Name `xml:"urn:ietf:params:xml:ns:xmpp-sasl failure"`
 	Reason xml.Name `xml:",any"`
 }
+
+// BUG(matt): authentication incorrectly reports, "No supported SASL mechanism
+// found", for authentication attemtps that fail due to invalid credentials.
diff --git a/src/xmpp/xmpp.go b/src/xmpp/xmpp.go
index d4a6653..5994d41 100644
--- a/src/xmpp/xmpp.go
+++ b/src/xmpp/xmpp.go
@@ -204,3 +204,5 @@ func (x *XMPP) receiver() {
 		}
 	}
 }
+
+// BUG(matt): Filter channels are not closed when the stream is closed.