diff --git a/src/aaz_dev/command/api/_cmds.py b/src/aaz_dev/command/api/_cmds.py
index 6c4c9804..a21021bc 100644
--- a/src/aaz_dev/command/api/_cmds.py
+++ b/src/aaz_dev/command/api/_cmds.py
@@ -112,7 +112,7 @@ def generate_command_models_from_swagger(swagger_tag, workspace_path=None):
                 "id": resource_id
             })
 
-        mod_names = Config.DEFAULT_SWAGGER_MODULE.split('/')
+        mod_names = Config.DEFAULT_SWAGGER_MODULE
         ws = WorkspaceManager.new(
             name=Config.DEFAULT_SWAGGER_MODULE,
             plane=Config.DEFAULT_PLANE,
diff --git a/src/aaz_dev/command/controller/workspace_manager.py b/src/aaz_dev/command/controller/workspace_manager.py
index 6a16b457..8eed4c54 100644
--- a/src/aaz_dev/command/controller/workspace_manager.py
+++ b/src/aaz_dev/command/controller/workspace_manager.py
@@ -1070,10 +1070,12 @@ def generate_to_aaz(self):
         # Merge the commands of subresources which exported in aaz but not exist in current workspace
         self._merge_sub_resources_in_aaz()
 
-        # update client config
-        editor = self.load_client_cfg_editor()
-        if editor:
-            self.aaz_specs.update_client_cfg(editor.cfg)
+        # in memory worspace folder does not support client cfg
+        if not self.is_in_memory:
+            # update client config
+            editor = self.load_client_cfg_editor()
+            if editor:
+                self.aaz_specs.update_client_cfg(editor.cfg)
 
         # update configurations
         for ws_leaf in self.iter_command_tree_leaves():
diff --git a/src/aaz_dev/swagger/model/specs/_resource_provider.py b/src/aaz_dev/swagger/model/specs/_resource_provider.py
index ce925954..0ae26ae9 100644
--- a/src/aaz_dev/swagger/model/specs/_resource_provider.py
+++ b/src/aaz_dev/swagger/model/specs/_resource_provider.py
@@ -96,7 +96,7 @@ def _parse_readme_input_file_tags(self):
                 readme = f.read()
 
             re_yaml = re.compile(
-                r'```\s*yaml\s*(.*\$\(\s*tag\s*\)\s*==\s*[\'"]\s*(.*)\s*[\'"].*)?\n((((?!```).)*\n)*)\s*```\s*\n',
+                r'```\s*yaml\s*(.*\$\(\s*tag\s*\)\s*==\s*[\'"]\s*(.*)\s*[\'"].*)?\n((((?!```).)*\n)*)\s*```\s*',
                 flags=re.MULTILINE)
             for piece in re_yaml.finditer(readme):
                 flags = piece[1]