diff --git a/site-lisp/db-org.el b/site-lisp/db-org.el
index 3258323..b992a8d 100644
--- a/site-lisp/db-org.el
+++ b/site-lisp/db-org.el
@@ -23,6 +23,7 @@
 
 (autoload 'which-function "which-func")
 (autoload 'org-element-property "org-element")
+(autoload 'db/org-agenda "db-utils")
 
 (declare-function w32-shell-execute "w32fns.c")
 
@@ -113,7 +114,7 @@ deadlines."
       (setq buffer-read-only t)
       (message ""))))
 
-(defun db/org-agenda-insert-active-filters (&optional match)
+(defun db/org-agenda-insert-active-filters (&optional _match)
   "Insert string showing the current agenda filters.
 
 The filter display is added after the structural header.
@@ -582,7 +583,7 @@ clocked in."
        (if at-current-clock-p
            ;; From `org-clock-get-clocked-time'
            (floor (org-time-convert-to-integer
-                   (org-time-since org-clock-start-time))
+                   (time-since org-clock-start-time))
                   60)
          0))))
 
@@ -1249,7 +1250,8 @@ clipboard as with `org-password-manager-get-password', which see.
 Otherwise, the password is returned as value from this function
 and can be used for further processing."
 
-  (require 'org-password-manager)
+  (eval-when-compile
+    (require 'org-password-manager))
   (let ((pom (org-id-find id 'marker)))
     (unless (markerp pom)
       (user-error "Cannot find item with id %s" id))
@@ -1914,25 +1916,24 @@ linking to any item."
                              ;; nil without any possibility for a custom string.
                              (unwind-protect
                                   (progn
-                                    (fset 'completing-read #'(lambda (_prompt
-                                                                      _table
+                                    (fset 'completing-read #'(lambda (prompt
+                                                                      table
                                                                       &optional
-                                                                        _predicate
-                                                                        _require-match
+                                                                        predicate
+                                                                        require-match
                                                                         _initial-input
-                                                                        _hist
-                                                                        _def
-                                                                        _inherit-input-method)
-                                                               (ignore _initial-input)
+                                                                        hist
+                                                                        def
+                                                                        inherit-input-method)
                                                                (funcall old-completing-read
-                                                                        _prompt
-                                                                        _table
-                                                                        _predicate
-                                                                        _require-match
+                                                                        prompt
+                                                                        table
+                                                                        predicate
+                                                                        require-match
                                                                         initial-input
-                                                                        _hist
-                                                                        _def
-                                                                        _inherit-input-method)))
+                                                                        hist
+                                                                        def
+                                                                        inherit-input-method)))
                                     (org-refile-get-location nil default-buffer))
                                (fset 'completing-read old-completing-read))))
            (pom (nth 3 target-pointer)))
diff --git a/site-lisp/db-utils.el b/site-lisp/db-utils.el
index f6e69be..335ca68 100644
--- a/site-lisp/db-utils.el
+++ b/site-lisp/db-utils.el
@@ -28,6 +28,7 @@
 (autoload 'ldap-search "ldap")
 (autoload 'find-libary-name "find-func")
 (autoload 'lm-header "lisp-mnt")
+(autoload 'dired-dwim-target-directory "dired-aux")
 
 (declare-function w32-shell-execute "w32fns.c")
 (declare-function org-password-manager-get-password-by-id nil)
@@ -486,6 +487,8 @@ numbers allowed)."
 
 From: https://oremacs.com/2017/03/18/dired-ediff/."
   (interactive)
+  (eval-when-compile
+    (require 'ediff))
   (let ((files (dired-get-marked-files))
         (wnd (current-window-configuration)))
     (if (<= (length files) 2)
@@ -517,6 +520,8 @@ Also add the default as initial input instead of as default
 proper.  The latter does not play well with my current completion
 framework, as it always tries to match my input with default
 entries, even if I want to use the input directly."
+  (eval-when-compile
+    (require 'grep))
   (let* ((bn (funcall grep-read-files-function))
          (fn (and bn
                   (stringp bn)