diff --git a/apps/aam-cli/src/aam_cli/commands/convert.py b/apps/aam-cli/src/aam_cli/commands/convert.py
index c3e92c9..f77f5a0 100644
--- a/apps/aam-cli/src/aam_cli/commands/convert.py
+++ b/apps/aam-cli/src/aam_cli/commands/convert.py
@@ -218,6 +218,12 @@ def _print_verbose_workaround(console: Console, warning: str) -> None:
     warning_lower = warning.lower()
 
     for key, workaround in VERBOSE_WORKAROUNDS.items():
-        if key.replace("_", " ").replace("removed", "").strip() in warning_lower:
+        normalized_key = (
+            key.replace("_", " ")
+            .replace("removed", "")
+            .strip()
+            .lower()
+        )
+        if normalized_key and normalized_key in warning_lower:
             console.print(f"      [dim]{workaround}[/dim]")
             return
diff --git a/apps/aam-cli/src/aam_cli/converters/frontmatter.py b/apps/aam-cli/src/aam_cli/converters/frontmatter.py
index c6e126e..0fe71fc 100644
--- a/apps/aam-cli/src/aam_cli/converters/frontmatter.py
+++ b/apps/aam-cli/src/aam_cli/converters/frontmatter.py
@@ -53,13 +53,24 @@ def parse_frontmatter(text: str) -> tuple[dict[str, Any], str]:
     if not stripped.startswith("---"):
         return {}, text
 
-    # Find the closing ---
-    end_idx = stripped.find("---", 3)
-    if end_idx == -1:
+    # Split into lines and find the closing '---' on its own line
+    lines = stripped.splitlines(keepends=True)
+    if not lines:
         return {}, text
 
-    yaml_block = stripped[3:end_idx].strip()
-    body = stripped[end_idx + 3:].lstrip("\n")
+    closing_idx: int | None = None
+    for i, line in enumerate(lines[1:], start=1):
+        if line.strip() == "---":
+            closing_idx = i
+            break
+
+    if closing_idx is None:
+        return {}, text
+
+    # YAML block is everything between the opening and closing delimiters
+    yaml_block = "".join(lines[1:closing_idx]).strip()
+    # Body is everything after the closing delimiter
+    body = "".join(lines[closing_idx + 1:]).lstrip("\n")
 
     try:
         frontmatter = yaml.safe_load(yaml_block)
diff --git a/docs/DESIGN.md b/docs/DESIGN.md
index fb7a3df..f7e14e2 100644
--- a/docs/DESIGN.md
+++ b/docs/DESIGN.md
@@ -791,6 +791,7 @@ Detection patterns:
     ─ instructions/*.md                  (AAM convention)
     ─ .cursor/rules/*.mdc                (Cursor rules, excluding agent-* rules)
     ─ CLAUDE.md                          (Claude instructions)
+    ─ .github/copilot-instructions.md    (Copilot legacy instructions)
     ─ .github/instructions/*.instructions.md  (Copilot instructions)
     ─ AGENTS.md                          (Codex instructions)
 ```
diff --git a/docs/user_docs/docs/mcp/index.md b/docs/user_docs/docs/mcp/index.md
index e1cec0a..47411cd 100644
--- a/docs/user_docs/docs/mcp/index.md
+++ b/docs/user_docs/docs/mcp/index.md
@@ -13,7 +13,7 @@ flowchart LR
     IDE["IDE / AI Agent<br/>(Cursor, Claude Desktop, etc.)"] -->|MCP protocol| AAM["AAM MCP Server<br/>(aam mcp serve)"]
     AAM -->|reads/writes| Config["~/.aam/config.yaml"]
     AAM -->|manages| Packages["~/.aam/packages/"]
-    AAM -->|clones/fetches| Sources["~/.aam/sources-cache/"]
+    AAM -->|clones/fetches| Sources["~/.aam/cache/git/"]
 
     style IDE fill:#e3f2fd
     style AAM fill:#f3e5f5
diff --git a/docs/user_docs/docs/platforms/copilot.md b/docs/user_docs/docs/platforms/copilot.md
index 46d290f..3e8dc50 100644
--- a/docs/user_docs/docs/platforms/copilot.md
+++ b/docs/user_docs/docs/platforms/copilot.md
@@ -195,7 +195,7 @@ scope: project
 ---
 name: python-standards
 description: "Python coding standards"
-scope: project
+applyTo: "**"
 ---
 
 # Python Coding Standards