diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index d0de6fd04..195f7c618 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -623,7 +623,7 @@ class FederationHandler(BaseHandler):
             raise AuthError(403, "Host not in room.")
 
         events = yield self.store.get_backfill_events(
-            context,
+            room_id,
             pdu_list,
             limit
         )
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 16c662829..6d0db18e5 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -428,7 +428,9 @@ class RoomMemberHandler(BaseHandler):
         if not is_host_in_room:
             # is *anyone* in the room?
             room_member_keys = [
-                v for (k,v) in context.current_state.keys() if k == "m.room.member"
+                v for (k, v) in context.current_state.keys() if (
+                    k == "m.room.member"
+                )
             ]
             if len(room_member_keys) == 0:
                 # has the room been created so we can join it?