diff --git a/common/djangoapps/third_party_auth/provider.py b/common/djangoapps/third_party_auth/provider.py
index c2a95e3483..00299a6db6 100644
--- a/common/djangoapps/third_party_auth/provider.py
+++ b/common/djangoapps/third_party_auth/provider.py
@@ -7,7 +7,7 @@ from django.contrib.sites.models import Site
 
 from openedx.core.djangoapps.theming.helpers import get_current_request
 
-from .models import (
+from common.djangoapps.third_party_auth.models import (
     _LTI_BACKENDS,
     _PSA_OAUTH2_BACKENDS,
     _PSA_SAML_BACKENDS,
diff --git a/docs/docs_settings.py b/docs/docs_settings.py
index 87959f39f4..03992630e3 100644
--- a/docs/docs_settings.py
+++ b/docs/docs_settings.py
@@ -41,6 +41,8 @@ INSTALLED_APPS.extend([
     'contentstore.apps.ContentstoreConfig',
     'cms.djangoapps.course_creators',
     'xblock_config.apps.XBlockConfig',
-    'user_tasks',
     'lms.djangoapps.lti_provider'
 ])
+
+
+COMMON_TEST_DATA_ROOT = ''
diff --git a/docs/guides/conf.py b/docs/guides/conf.py
index 6c36e8306e..dfc8747fc6 100644
--- a/docs/guides/conf.py
+++ b/docs/guides/conf.py
@@ -255,6 +255,17 @@ for app in os.listdir(six.text_type(root / 'common' / 'djangoapps')):
         modules[path] = path
 
 
+# These Django apps under lms don't import correctly with the "lms.djangapps" prefix
+# Others don't import correctly without it...INSTALLED_APPS entries are inconsistent
+lms_djangoapps = ['badges', 'branding', 'bulk_email', 'courseware',
+                  'coursewarehistoryextended', 'email_marketing', 'experiments', 'lti_provider',
+                  'mobile_api', 'notes', 'rss_proxy', 'shoppingcart', 'survey']
+for app in lms_djangoapps:
+    path = os.path.join('lms', 'djangoapps', app)
+    if app not in ['notes']:
+        modules[path] = path
+
+
 def update_settings_module(service='lms'):
     """
     Set the "DJANGO_SETTINGS_MODULE" environment variable appropriately
@@ -283,6 +294,7 @@ def on_init(app):  # pylint: disable=unused-argument
     exclude_dirs = ['envs', 'migrations', 'test', 'tests']
     exclude_dirs.extend(cms_djangoapps)
     exclude_dirs.extend(lms_djangoapps)
+
     exclude_files = ['admin.py', 'test.py', 'testing.py', 'tests.py', 'testutils.py', 'wsgi.py']
     for module in modules:
         module_path = six.text_type(root / module)
@@ -315,5 +327,5 @@ def on_init(app):  # pylint: disable=unused-argument
 
 def setup(app):
     """Sphinx extension: run sphinx-apidoc."""
-    event = b'builder-inited' if six.PY2 else 'builder-inited'
+    event = 'builder-inited'
     app.connect(event, on_init)
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index df0d3297a0..2dc0f2e310 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -136,3 +136,6 @@ sympy==1.6.2
 
 # cryptography 3.3.1 started failing tests on sandbox because it dropped support for python3.5
 cryptography==3.2.1
+
+# greater versions breaking the code
+Sphinx==3.3.0