diff --git a/docs/conf.py b/docs/conf.py
index 691fbdf7c..feedd553d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@ extlinks = {
 # Links used for cross-referencing stuff in other documentation
 intersphinx_mapping = {
   'py': ('https://docs.python.org/3', None),
-  'aio': ('https://aiohttp.readthedocs.io/en/stable/', None),
+  'aio': ('https://docs.aiohttp.org/en/stable/', None),
   'req': ('http://docs.python-requests.org/en/latest/', 'requests.inv')
 }
 
@@ -319,6 +319,6 @@ texinfo_documents = [
 #texinfo_no_detailmenu = False
 
 def setup(app):
-  app.add_javascript('custom.js')
+  app.add_js_file('custom.js')
   if app.config.language == 'ja':
     app.config.intersphinx_mapping['py'] = ('https://docs.python.org/ja/3', None)
diff --git a/docs/extensions/attributetable.py b/docs/extensions/attributetable.py
index 234f944fa..548d87a47 100644
--- a/docs/extensions/attributetable.py
+++ b/docs/extensions/attributetable.py
@@ -107,7 +107,8 @@ def build_lookup_table(env):
     ignored = {
         'data', 'exception', 'module', 'class',
     }
-    for (fullname, (docname, objtype)) in domain.objects.items():
+
+    for (fullname, _, objtype, docname, _, _) in domain.get_objects():
         if objtype in ignored:
             continue