diff --git a/contrib/cmake/src/qe/CMakeLists.txt b/contrib/cmake/src/qe/CMakeLists.txt
index b197183dc..6e82e2c96 100644
--- a/contrib/cmake/src/qe/CMakeLists.txt
+++ b/contrib/cmake/src/qe/CMakeLists.txt
@@ -21,7 +21,7 @@ z3_add_component(qe
     vsubst_tactic.cpp
   COMPONENT_DEPENDENCIES
     nlsat_tactic
-    nlqsat
+    nlsat
     sat
     smt   
     tactic 
diff --git a/scripts/mk_genfile_common.py b/scripts/mk_genfile_common.py
index 2e2978a61..38d173108 100644
--- a/scripts/mk_genfile_common.py
+++ b/scripts/mk_genfile_common.py
@@ -57,7 +57,7 @@ def sorted_headers_by_component(l):
         _logger.debug("get_key({})".format(path))
         path_components = []
         stripped_path = path
-        assert 'src' in stripped_path.split(os.path.sep)
+        assert 'src' in stripped_path.split(os.path.sep) or 'src' in stripped_path.split('/')
         # Keep stripping off directory components until we hit ``src``
         while os.path.basename(stripped_path) != 'src':
             path_components.append(os.path.basename(stripped_path))
@@ -214,7 +214,7 @@ def mk_gparams_register_modules_internal(component_src_dirs, path):
     """
     assert isinstance(component_src_dirs, list)
     assert check_dir_exists(path)
-    cmds = []
+    cmds = []    
     mod_cmds = []
     mod_descrs = []
     fullname = os.path.join(path, 'gparams_register_modules.cpp')