diff --git a/ChangeLog b/ChangeLog
index 47c53c1e..9f74fd2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2026-06-05  Mats Lidell  <matsl@gnu.org>
+
+* hui.el (kcell-view:label): Declare function.
+    (hui:copy-message-length): Use type and group.
+
+* hypb.el (smart-ancestor-tag-files): Declare function.
+
+* hui-mouse.el (smart-calendar, smart-calendar-assist): Use
+    calendar-scroll-calendar-right and calendar-scroll-calendar-left.
+
+* hywiki.el (hywiki-org-format-heading): Use
+    org-fold-core-remove-optimization.
+
 2026-06-04  Bob Weiner  <rsw@gnu.org>
 
 * hibtypes.el (hib-python-traceback, debugger-source): Fix 2nd regexp in
diff --git a/hui-mouse.el b/hui-mouse.el
index c8a94b2c..bc660072 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -889,9 +889,15 @@ If key is pressed:
 
   (interactive)
   (cond ((smart-eobp) (calendar-cursor-to-nearest-date)
-	 (calendar-scroll-left-three-months 1))
+	 (if (fboundp 'calendar-scroll-calendar-left)
+             (calendar-scroll-calendar-left)
+           (with-suppressed-warnings ((obsolete calendar-scroll-left-three-months))
+             (calendar-scroll-left-three-months 1))))
 	((< (current-column) 5) (calendar-cursor-to-nearest-date)
-	 (calendar-scroll-right-three-months 1))
+	 (if (fboundp 'calendar-scroll-calendar-right)
+             (calendar-scroll-calendar-right)
+           (with-suppressed-warnings ((obsolete calendar-scroll-right-three-months))
+             (calendar-scroll-right-three-months 1))))
 	(t (calendar-cursor-to-nearest-date)
 	   (diary-view-entries 1))))
 
@@ -911,9 +917,15 @@ If assist key is pressed:
 
   (interactive)
   (cond ((smart-eobp) (calendar-cursor-to-nearest-date)
-	 (calendar-scroll-right-three-months 1))
+	 (if (fboundp 'calendar-scroll-calendar-left)
+             (calendar-scroll-calendar-left)
+           (with-suppressed-warnings ((obsolete calendar-scroll-left-three-months))
+             (calendar-scroll-left-three-months 1))))
 	((< (current-column) 5) (calendar-cursor-to-nearest-date)
-	 (calendar-scroll-left-three-months 1))
+         (if (fboundp 'calendar-scroll-calendar-right)
+             (calendar-scroll-calendar-right)
+           (with-suppressed-warnings ((obsolete calendar-scroll-right-three-months))
+             (calendar-scroll-right-three-months 1))))
 	(t (diary-mark-entries))))
 
 ;;; ************************************************************************
diff --git a/hui.el b/hui.el
index fd27d4bb..d0ad0e38 100644
--- a/hui.el
+++ b/hui.el
@@ -51,6 +51,7 @@
 (declare-function hywiki-referent-exists-p "hywiki")
 (declare-function kcell-view:absolute-reference "kotl/kview")
 (declare-function kcell-view:idstamp "kotl/kview")
+(declare-function kcell-view:label "kotl/kview")
 (declare-function klink:absolute "kotl/klink")
 (declare-function klink:at-p "kotl/klink")
 (declare-function kotl-mode "kotl/kotl-mode")
@@ -64,7 +65,9 @@
 
 (defcustom hui:copy-message-length 40
   "Maximum character length of the message displayed after copying text.
-  Set to 0 for no message.")
+Set to 0 for no message."
+  :type 'integer
+  :group 'hyperbole-buttons)
 
 (defcustom hui:ebut-prompt-for-action nil
   "Non-nil prompts for a button-specific action on explicit button creation."
diff --git a/hypb.el b/hypb.el
index 1911ac11..4cd04cca 100644
--- a/hypb.el
+++ b/hypb.el
@@ -62,6 +62,7 @@
 
 (defvar hsys-org-enable-smart-keys)     ; "hsys-org.el"
 (declare-function kview:char-invisible-p "kotl/kview")
+(declare-function smart-ancestor-tag-files "hmouse-tag")
 (declare-function smart-eobp "hui-mouse")
 
 ;;; ************************************************************************
diff --git a/hywiki.el b/hywiki.el
index 23197e5f..9e2e2d6e 100644
--- a/hywiki.el
+++ b/hywiki.el
@@ -3426,7 +3426,10 @@ When NO-STATS is non-nil, don't include statistics in square brackets."
         ;; When using `org-fold-core--optimise-for-huge-buffers',
         ;; returned text will be invisible.  Clear it up.
         (save-match-data
-          (org-fold-core-remove-optimisation (match-beginning 0) (match-end 0)))
+          (if (fboundp 'org-fold-core-remove-optimization)
+              (org-fold-core-remove-optimization (match-beginning 0) (match-end 0))
+            (with-suppressed-warnings ((obsolete org-fold-core-remove-optimisation))
+              (org-fold-core-remove-optimisation (match-beginning 0) (match-end 0)))))
         (let ((todo (and (not no-todo) (match-string 2 heading)))
 	      (priority (and (not no-priority) (match-string 3 heading)))
 	      (headline (pcase (match-string 4 heading)
@@ -3446,7 +3449,10 @@ When NO-STATS is non-nil, don't include statistics in square brackets."
                    "\\(?: +\\[[0-9%+/]+\\]\\)+" "" headline)))
 
           ;; Restore cleared optimization.
-          (org-fold-core-update-optimisation (match-beginning 0) (match-end 0))
+          (if (fboundp 'org-fold-core-remove-optimization)
+              (org-fold-core-remove-optimization (match-beginning 0) (match-end 0))
+            (with-suppressed-warnings ((obsolete org-fold-core-remove-optimisation))
+              (org-fold-core-remove-optimisation (match-beginning 0) (match-end 0))))
 	  (mapconcat #'identity
 		     (delq nil (list todo priority headline tags))
         	     " "))))))