diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/bytesearch/bytepatternsearch/BpsPattern.java b/Ghidra/Features/Base/src/main/java/ghidra/util/bytesearch/bytepatternsearch/BpsPattern.java
index eb159d9a68..e8dd9b382d 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/util/bytesearch/bytepatternsearch/BpsPattern.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/util/bytesearch/bytepatternsearch/BpsPattern.java
@@ -46,7 +46,7 @@ import java.util.stream.IntStream;
  * The pattern's search type is indicated in the parent {@link BpsSearchItem}:
  * <em>OrderedFunction</em>-type and <em>Table</em>-type searches will enforce the order of the
  * buffer as presented in the pattern. See {@link BpsSearchType} for a complete discussion on search
- * types.
+ * types.</li>
  * 
  * <li><strong>buffer</strong>
  * <p>
diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/JitCodeGenerator.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/JitCodeGenerator.java
index 0290e4f421..43b2a9160f 100644
--- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/JitCodeGenerator.java
+++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/JitCodeGenerator.java
@@ -834,7 +834,7 @@ public class JitCodeGenerator<THIS extends JitCompiledPassage> {
 	 * @param block the block
 	 * @param opIdx the index, within the whole passage, of the first op in the block
 	 * @return the result of block generation
-	 * @see #genBlock(OpResult, Local, Local, RetReq, JitBlock, int)
+	 * @see  #genOp(Emitter, Local, Local, RetReq, PcodeOp, JitBlock, int)
 	 */
 	protected GenBlockResult genBlockOps(Emitter<Bot> em, Local<TRef<THIS>> localThis,
 			Local<TInt> localCtxmod, RetReq<TRef<EntryPoint>> retReq, JitBlock block, int opIdx) {
@@ -945,7 +945,6 @@ public class JitCodeGenerator<THIS extends JitCompiledPassage> {
 	 * {@link #genBlockOps(Emitter, Local, Local, RetReq, JitBlock, int)}.
 	 * 
 	 * @param block the block
-	 * @param opIdx the index, within the whole passage, of the first op in the block
 	 * @return the index, within the whole passage, of the op immediately after the block
 	 */
 	protected GenBlockResult genBlock(GenBlockResult prev, Local<TRef<THIS>> localThis,
@@ -1207,11 +1206,11 @@ public class JitCodeGenerator<THIS extends JitCompiledPassage> {
 	 * {@link IllegalArgumentException}. We do not jump directly to the block's translation. Instead
 	 * we emit a prologue for each block, wherein we birth the variables that block expects to be
 	 * live, and then jump to the translation. Then, we emit the translation for each block using
-	 * {@link #genBlock(OpResult, Local, Local, RetReq, JitBlock, int)}, placing transitions between
+	 * {@link #genBlock(GenBlockResult, Local, Local, RetReq, JitBlock)}, placing transitions between
 	 * those connected by fall through using
 	 * {@link VarGen#computeBlockTransition(Local, JitCodeGenerator, BlockFlow)}. Finally, we emit
 	 * each requested exception handler using
-	 * {@link ExceptionHandler#genRun(Emitter, Local, JitCodeGenerator)}.
+	 * {@link ExceptionHandler#genRun(Emitter, Local, JitCodeGenerator, int)}.
 	 * 
 	 * @param em the emitter
 	 * @param localThis a handle to the local holding the {@code this} reference
diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchIndOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchIndOpGen.java
index 354a33b7eb..e11f81de53 100644
--- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchIndOpGen.java
+++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchIndOpGen.java
@@ -164,7 +164,7 @@ public enum BranchIndOpGen implements OpGen<JitBranchIndOp> {
 	 *           <li>While we might benefit from compile-time lookup of the exit slot, the run-time
 	 *           conditional check is still little or no improvement over the run-time hash-map
 	 *           lookup.</li>
-	 *           </ul>
+	 *           </ol>
 	 */
 	@Override
 	public <THIS extends JitCompiledPassage> OpResult genRun(Emitter<Bot> em,