diff --git a/src/Room.c b/src/Room.c
index 604f504..fc21f9b 100644
--- a/src/Room.c
+++ b/src/Room.c
@@ -304,8 +304,9 @@ RoomPopulate(Room *room, User *user, RoomCreateRequest *req, ServerPart s)
         JsonValueBoolean(req->is_direct), 1, "is_direct"));
     /* TODO: The rest of the events mandated by the specification on 
      * POST /createRoom, and error management. */
-
     Free(sender_str);
+
+    /* TODO: Error management (and invite_3pid, later) */
 }
 Room *
 RoomCreate(Db * db, User *user, RoomCreateRequest * req, ServerPart s)
@@ -668,7 +669,8 @@ PopulateEventV1(Room * room, HashMap * event, PduV1 * pdu, ServerPart serv)
         ArrayAdd(pdu->prev_events, JsonValueDuplicate(event_id));
     }
     
-    /* TODO: Signature and alldat. */
+    /* TODO: Signatures. 
+     * We currently *don't* have an Ed25519 implementation. */
 
     return false;
 }
@@ -990,7 +992,7 @@ AuthorizeInviteMembershipV1(Room * room, PduV1 pdu, HashMap *state)
     }
     /* Step 5.3.3: If target user’s current membership state is join or ban, reject. */
     if (RoomUserHasMembership(room, state, pdu.state_key, "join") ||
-        RoomUserHasMembership(room, state, pdu.state_key, "join"))
+        RoomUserHasMembership(room, state, pdu.state_key, "ban"))
     {
         return false;
     }