diff --git a/modules/emacs/ibuffer/packages.el b/modules/emacs/ibuffer/packages.el
index 9139d0e76..21ae2d78c 100644
--- a/modules/emacs/ibuffer/packages.el
+++ b/modules/emacs/ibuffer/packages.el
@@ -2,4 +2,4 @@
 ;;; emacs/ibuffer/packages.el
 
 (package! ibuffer-projectile :pin "ecbe482804a217b1471593f6c7a8b3d64f3cdc47")
-(package! ibuffer-vc :pin "5fa6aea09bc67f71ea743302d609f459967b1e81")
+(package! ibuffer-vc :pin "9204001d1c5ca39409485c1574fd315b0e137a92")
diff --git a/modules/emacs/undo/config.el b/modules/emacs/undo/config.el
index a113a5745..5357963f9 100644
--- a/modules/emacs/undo/config.el
+++ b/modules/emacs/undo/config.el
@@ -31,6 +31,11 @@
   :config
   (setq undo-fu-session-incompatible-files '("\\.gpg$" "/COMMIT_EDITMSG\\'" "/git-rebase-todo\\'"))
 
+  (when (executable-find "zstd")
+    ;; There are other algorithms available, but zstd is the fastest, and speed
+    ;; is our priority within Emacs
+    (setq undo-fu-session-compression 'zst))
+
   ;; HACK Fix #4993: we've advised `make-backup-file-name-1' to produced SHA1'ed
   ;;      filenames to prevent file paths that are too long, so we force
   ;;      `undo-fu-session--make-file-name' to use it instead of its own
@@ -38,17 +43,9 @@
   ;; TODO PR this upstream; should be a universal issue
   (defadvice! +undo-fu-make-hashed-session-file-name-a (file)
     :override #'undo-fu-session--make-file-name
-    (let ((backup-directory-alist `(("." . ,undo-fu-session-directory))))
-      (concat (make-backup-file-name-1 file)
-              (if undo-fu-session-compression ".gz" ".el"))))
-
-  ;; HACK Use the faster zstd to compress undo files instead of gzip
-  (when (executable-find "zstd")
-    (defadvice! +undo--append-zst-extension-to-file-name-a (filename)
-      :filter-return #'undo-fu-session--make-file-name
-      (if undo-fu-session-compression
-          (concat (file-name-sans-extension filename) ".zst")
-        filename))))
+    (concat (let ((backup-directory-alist `(("." . ,undo-fu-session-directory))))
+              (make-backup-file-name-1 file))
+            (undo-fu-session--file-name-ext))))
 
 
 (use-package! undo-tree
diff --git a/modules/emacs/undo/packages.el b/modules/emacs/undo/packages.el
index d10fa27a2..c86aefd77 100644
--- a/modules/emacs/undo/packages.el
+++ b/modules/emacs/undo/packages.el
@@ -2,6 +2,6 @@
 ;;; emacs/undo/packages.el
 
 (if (modulep! +tree)
-    (package! undo-tree :pin "e326c6135e62f5fe8536528d3acd5e798f847407")
-  (package! undo-fu :pin "ab8bc10e424bccc847800c31ab41888db789d55d")
-  (package! undo-fu-session :pin "3e810c7c9ab75d2b6f92c7c876290abbc164e750"))
+    (package! undo-tree :pin "16f4121032d09ef44b3d7d02c4d02c3c2f18041f")
+  (package! undo-fu :pin "0e22308de8337a9291ddd589edae167d458fbe77")
+  (package! undo-fu-session :pin "7b3fd0647dd1fbd02101eec61440e6d44953bcd9"))
diff --git a/modules/emacs/vc/packages.el b/modules/emacs/vc/packages.el
index 651457bd6..a3390e867 100644
--- a/modules/emacs/vc/packages.el
+++ b/modules/emacs/vc/packages.el
@@ -5,10 +5,10 @@
 (package! vc-annotate :built-in t)
 (package! smerge-mode :built-in t)
 
-(package! browse-at-remote :pin "cef26f2c063f2473af42d0e126c8613fe2f709e4")
+(package! browse-at-remote :pin "c020975a891438e278ad1855213d4f3d62c9fccb")
 (package! git-commit :pin "30b0debaaadadec6103a8d7eab92322fd9d30a15")
 (package! git-timemachine
   ;; The original lives on codeberg.org; which has uptime issues.
   :recipe (:host github :repo "emacsmirror/git-timemachine")
-  :pin "ca09684e94767cc0b2339b77b778b4de4f9d104f")
-(package! git-modes :pin "eca3bb42ea8abed9ef8549b2ac91bbea445c5bb5")
+  :pin "d8ffd0d7cc4ab3dd7de494c9ea36dfd99e2744fa")
+(package! git-modes :pin "f0a0154bf48dd1c0c587596cf4cfd3c90f673a05")