diff --git a/src/insns/cj_j_16bit.adoc b/src/insns/cj_j_16bit.adoc
index 5e702241..54c740e4 100644
--- a/src/insns/cj_j_16bit.adoc
+++ b/src/insns/cj_j_16bit.adoc
@@ -33,7 +33,9 @@ Set the next PC following the standard `jal` definition.
  *There is no difference in Capability Mode or Legacy Mode execution for this instruction.*
 
 Exceptions::
-CHERI Length Violation
+See <<CJAL>>, <<JAL>>
+
+include::pcrel_debug_warning.adoc[]
 
 Prerequisites for C.CJ::
 {c_cheri_base_ext_names}
diff --git a/src/insns/cjal_jal_16bit.adoc b/src/insns/cjal_jal_16bit.adoc
index 710068c0..3fe93147 100644
--- a/src/insns/cjal_jal_16bit.adoc
+++ b/src/insns/cjal_jal_16bit.adoc
@@ -29,6 +29,11 @@ include::wavedrom/c-cjal-format-ls.adoc[]
 
 include::cjal_jal_common.adoc[]
 
+Exceptions::
+See <<CJAL>>, <<JAL>>
+
+include::pcrel_debug_warning.adoc[]
+
 Prerequisites for C.CJAL::
 {c_cheri_base_ext_names}
 
diff --git a/src/insns/cjalr_jalr_16bit.adoc b/src/insns/cjalr_jalr_16bit.adoc
index 601efe3e..809c233c 100644
--- a/src/insns/cjalr_jalr_16bit.adoc
+++ b/src/insns/cjalr_jalr_16bit.adoc
@@ -29,6 +29,11 @@ include::wavedrom/c-cjalr-format-ls.adoc[]
 
 include::cjalr_jalr_common.adoc[]
 
+Exceptions::
+See <<CJALR>>, <<JALR>>
+
+include::pcrel_debug_warning.adoc[]
+
 Prerequisites C.CJALR::
 {c_cheri_base_ext_names}
 
diff --git a/src/insns/cjr_jr_16bit.adoc b/src/insns/cjr_jr_16bit.adoc
index 6f98eeb8..320ac7ca 100644
--- a/src/insns/cjr_jr_16bit.adoc
+++ b/src/insns/cjr_jr_16bit.adoc
@@ -1,13 +1,14 @@
 <<<
 //[#insns-cjr_jr-16bit,reftext="Conditional branches (C.CJR, C.JR), 16-bit encodings"]
 
+[#C_JR,reftext="C.JR"]
+==== C.JR
+
+See <<C.CJR>>.
+
 [#C_CJR,reftext="C.CJR"]
 ==== C.CJR
 
-See <<C.JR>>.
-
-[#C_JR,reftext="C.JR"]
-==== C.JR
 
 Synopsis::
 Register based jumps without link, 16-bit encodings
@@ -35,7 +36,7 @@ Set the next PC according to the standard `jalr` definition.
  Check a minimum length instruction is in <<pcc>> bounds at the target PC, take a CHERI Length Violation exception on error.
 
 Exceptions::
- See <<CJALR>>, <<JALR>>
+See <<CJALR>>, <<JALR>>
 
 include::pcrel_debug_warning.adoc[]
 
diff --git a/src/insns/wavedrom/c-cjalr-format-ls.adoc b/src/insns/wavedrom/c-cjalr-format-ls.adoc
index 83cbe671..01ae1acf 100644
--- a/src/insns/wavedrom/c-cjalr-format-ls.adoc
+++ b/src/insns/wavedrom/c-cjalr-format-ls.adoc
@@ -4,8 +4,8 @@
 ....
 {reg: [
   {bits: 2, name: 'op',      type: 8, attr: ['2','C2=10']},
-  {bits: 5, name: 'rs2',     type: 4, attr: ['5','0']},
-  {bits: 5, name: 'rs1',     type: 4, attr: ['5','src!=0']},
+  {bits: 5, name: 'cs2/rs2',     type: 4, attr: ['5','0']},
+  {bits: 5, name: 'cs1/rs1',     type: 4, attr: ['5','src!=0']},
   {bits: 4, name: 'funct4',  type: 8, attr: ['4', 'cap: C.CJALR=1001', 'leg: C.JALR=1001']},
 ], config: {bits: 16}}
 ....
diff --git a/src/insns/wavedrom/c-cr-format-ls.adoc b/src/insns/wavedrom/c-cr-format-ls.adoc
index 24444be6..0df02f21 100644
--- a/src/insns/wavedrom/c-cr-format-ls.adoc
+++ b/src/insns/wavedrom/c-cr-format-ls.adoc
@@ -4,8 +4,8 @@
 ....
 {reg: [
   {bits: 2, name: 'op',      type: 8, attr: ['2','C2=10']},
-  {bits: 5, name: 'rs2',     type: 4, attr: ['5','0']},
-  {bits: 5, name: 'rs1',     type: 4, attr: ['5','src!=0']},
+  {bits: 5, name: 'cs2/rs2',     type: 4, attr: ['5','0']},
+  {bits: 5, name: 'cs1/rs1',     type: 4, attr: ['5','src!=0']},
   {bits: 4, name: 'funct4',  type: 8, attr: ['4','cap: C.CJR=1000', 'leg: C.JR=1000']},
 ], config: {bits: 16}}
 ....