diff --git a/Xlib/display.py b/Xlib/display.py
index e0f7b5c..65df12d 100644
--- a/Xlib/display.py
+++ b/Xlib/display.py
@@ -66,9 +66,9 @@ class _BaseDisplay(protocol_display.Display):
     # Implement a cache of atom names, used by Window objects when
     # dealing with some ICCCM properties not defined in Xlib.Xatom
 
-    def __init__(self, *args, **keys):
+    def __init__(self, display = None):
         self.resource_classes = _resource_baseclasses.copy()
-        protocol_display.Display.__init__(self, *args, **keys)
+        protocol_display.Display.__init__(self, display)
         self._atom_cache = {}
 
     def get_atom(self, atomname, only_if_exists=0):
diff --git a/Xlib/ext/record.py b/Xlib/ext/record.py
index bb53ec1..ce0d448 100644
--- a/Xlib/ext/record.py
+++ b/Xlib/ext/record.py
@@ -215,9 +215,9 @@ class EnableContext(rq.ReplyRequest):
 
     # See the discussion on ListFonstsWithInfo in request.py
 
-    def __init__(self, callback, *args, **keys):
+    def __init__(self, callback, display, defer = False, *args, **keys):
         self._callback = callback
-        rq.ReplyRequest.__init__(self, *args, **keys)
+        rq.ReplyRequest.__init__(self, display, defer=defer, *args, **keys)
 
     def _parse_response(self, data):
         r, d = self._reply.parse_binary(data, self._display)
diff --git a/Xlib/ext/shape.py b/Xlib/ext/shape.py
index 05a517a..55b2bc4 100644
--- a/Xlib/ext/shape.py
+++ b/Xlib/ext/shape.py
@@ -220,7 +220,7 @@ def get_rectangles(self, source_kind):
         source_kind=source_kind,
     )
 
-def input_selected(self, ):
+def input_selected(self):
     return InputSelected(
         display=self.display,
         opcode=self.display.get_extension_major(extname),
@@ -249,14 +249,14 @@ def offset(self, destination_kind, x_offset, y_offset):
         y_offset=y_offset,
     )
 
-def query_extents(self, ):
+def query_extents(self):
     return QueryExtents(
         display=self.display,
         opcode=self.display.get_extension_major(extname),
         destination_window=self,
     )
 
-def query_version(self, ):
+def query_version(self):
     return QueryVersion(
         display=self.display,
         opcode=self.display.get_extension_major(extname),
diff --git a/Xlib/protocol/request.py b/Xlib/protocol/request.py
index b431e13..cfd4f3b 100644
--- a/Xlib/protocol/request.py
+++ b/Xlib/protocol/request.py
@@ -785,9 +785,9 @@ class ListFontsWithInfo(rq.ReplyRequest):
 
     # Bastards.
 
-    def __init__(self, *args, **keys):
+    def __init__(self, display, defer = False, *args, **keys):
         self._fonts = []
-        rq.ReplyRequest.__init__(self, *args, **keys)
+        rq.ReplyRequest.__init__(self, display, defer=defer, *args, **keys)
 
     def _parse_response(self, data):