diff --git a/.github/workflows/compiler-rs.yml b/.github/workflows/compiler-rs.yml
new file mode 100644
index 0000000000..6872eb25bb
--- /dev/null
+++ b/.github/workflows/compiler-rs.yml
@@ -0,0 +1,36 @@
+name: Cargo Build & Test
+
+on:
+  pull_request:
+
+env: 
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build_and_test:
+    name: compiler-rs
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install deps
+        run: |
+          make setup
+          make generate
+          make transform-to-openapi
+          make transform-expand-generics
+
+      - name: Install Rust
+        run: rustup update stable && rustup default stable
+
+      - run: cargo build --verbose
+        working-directory: compiler-rs
+
+      - run: cargo test --verbose
+        working-directory: compiler-rs
diff --git a/compiler-rs/clients_schema/src/transform/expand_generics.rs b/compiler-rs/clients_schema/src/transform/expand_generics.rs
index 9d7da2be4e..d6346cd319 100644
--- a/compiler-rs/clients_schema/src/transform/expand_generics.rs
+++ b/compiler-rs/clients_schema/src/transform/expand_generics.rs
@@ -152,6 +152,15 @@ pub fn expand(model: IndexedModel, config: ExpandConfig) -> anyhow::Result<Index
             itf.inherits = Some(expand_inherits(inherit, &mappings, model, ctx)?);
         }
 
+        if !itf.behaviors.is_empty() {
+            itf.behaviors.iter().for_each(|b| {
+                if b.generics.is_empty() {
+                    // If the behavior has no generics, we can just expand it
+                    let _ = expand_type(&b.typ, Vec::new(), model, ctx);
+                }
+            });
+        }
+
         // We keep the generic parameters of behaviors, but expand their value
         for behavior in &mut itf.behaviors {
             for arg in &mut behavior.generics {
diff --git a/compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm b/compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm
index feb5be1194..1a8bba3604 100644
Binary files a/compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm and b/compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm differ
diff --git a/compiler-rs/openapi_to_clients_schema/src/types.rs b/compiler-rs/openapi_to_clients_schema/src/types.rs
index b31d89c567..6d341465b3 100644
--- a/compiler-rs/openapi_to_clients_schema/src/types.rs
+++ b/compiler-rs/openapi_to_clients_schema/src/types.rs
@@ -121,7 +121,7 @@ fn generate_type_for_schema(
         })
     }
     if let Some(ref docs) = data.external_docs {
-        base.ext_doc_url = Some(docs.ext_docs_url.clone())
+        base.ext_doc_url = Some(docs.url.clone())
     }
 
     // TODO: data.readonly/writeonly -> OverloadOf?
@@ -402,6 +402,8 @@ fn generate_interface_def(
             required: required.contains(&name),
             doc_id: None,
             doc_url: None,
+            ext_doc_id: None,
+            ext_doc_url: None,
             codegen_name: None, // FIXME: extension in workplace search
             description: None,
             aliases: Vec::default(),
diff --git a/package.json b/package.json
index e936d7f831..0d26b9a7ed 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@stoplight/spectral-cli": "^6.13.0"
+    "@stoplight/spectral-cli": "^6.13.1"
   }
 }