diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index aec7a9fd96c..ef4edca1b22 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -482,7 +482,7 @@ macro(get_blender_version)
 	if(${_out_version_char_empty})
 		set(BLENDER_VERSION_CHAR_INDEX "0")
 	else()
-		set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w q y z)
+		set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w x y z)
 		list(FIND _char_ls ${BLENDER_VERSION_CHAR} _out_version_char_index)
 		math(EXPR BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index} + 1")
 		unset(_char_ls)
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index fd2b14658ad..41dd0eaf64f 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1683,6 +1683,7 @@ class WM_OT_addon_install(Operator):
 
     @staticmethod
     def _module_remove(path_addons, module):
+        import os
         module = os.path.splitext(module)[0]
         for f in os.listdir(path_addons):
             f_base = os.path.splitext(f)[0]
@@ -1699,6 +1700,7 @@ class WM_OT_addon_install(Operator):
         import traceback
         import zipfile
         import shutil
+        import os
 
         pyfile = self.filepath