diff --git a/.gitignore b/.gitignore
index 302136b9..4b78a4db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ scripts/docker/base/test-aac/
 scripts/docker/base/whl/
 scripts/docker/i/
 scripts/deps-docker/uncomment.py
+scripts/deps-docker/unhint.py
 contrib/package/arch/pkg/
 contrib/package/arch/src/
 
diff --git a/scripts/deps-docker/Dockerfile b/scripts/deps-docker/Dockerfile
index a79d9426..093aa2f8 100644
--- a/scripts/deps-docker/Dockerfile
+++ b/scripts/deps-docker/Dockerfile
@@ -156,6 +156,7 @@ COPY    uncomment.py unhint.py /z
 RUN     mv /z/mfusepy-3.1.1/mfusepy.py /z/dist/ \
         && cd /z/dist \
         && python3 /z/unhint.py \
+        && rm -f uh \
         && mv mfusepy.py f1 \
         && python3 /z/uncomment.py f1 \
         && sed -ri '/self.__critical_exception/d; /^from (typing|collections.abc) import/d' f1 \
diff --git a/scripts/deps-docker/codemirror.patch b/scripts/deps-docker/codemirror.patch
index aef47f6f..9e3bfe7f 100644
--- a/scripts/deps-docker/codemirror.patch
+++ b/scripts/deps-docker/codemirror.patch
@@ -114,12 +114,14 @@ diff -wNarU2 codemirror-5.65.1-orig/src/input/ContentEditableInput.js codemirror
 +  /*
    let order = getOrder(line, cm.doc.direction), side = "left"
    if (order) {
-@@ -405,4 +406,5 @@
+@@ -405,5 +406,6 @@
      side = partPos % 2 ? "right" : "left"
    }
+-  let result = nodeAndOffsetInLineMap(info.map, pos.ch, side)
 +  */
-   let result = nodeAndOffsetInLineMap(info.map, pos.ch, side)
++  let result = nodeAndOffsetInLineMap(info.map, pos.ch, "left")
    result.offset = result.collapse == "right" ? result.end : result.start
+   return result
 diff -wNarU2 codemirror-5.65.1-orig/src/input/movement.js codemirror-5.65.1/src/input/movement.js
 --- codemirror-5.65.1-orig/src/input/movement.js	2022-01-20 13:06:23.000000000 +0100
 +++ codemirror-5.65.1/src/input/movement.js	2022-02-09 22:50:18.145862052 +0100