diff --git a/EXPERIMENTAL/find-links-to-local.el b/EXPERIMENTAL/find-links-to-local.el
deleted file mode 100644
index d9a94c1bd..000000000
--- a/EXPERIMENTAL/find-links-to-local.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(defun org-find-links ()
-  (let* ((file (buffer-file-name))
-	 (tname (file-truename file)))
diff --git a/contrib/lisp/org-wikinodes.el b/contrib/lisp/org-wikinodes.el
index 0a000521e..85c32f6ce 100644
--- a/contrib/lisp/org-wikinodes.el
+++ b/contrib/lisp/org-wikinodes.el
@@ -119,10 +119,10 @@ setting of `org-wikinodes-create-targets'."
   (let ((create org-wikinodes-create-targets)
 	visiting buffer m pos file rpl)
     (setq pos
-	  (or (org-find-exact-headling-in-buffer target (current-buffer))
+	  (or (org-find-exact-headline-in-buffer target (current-buffer))
 	      (and (eq org-wikinodes-scope 'directory)
 		   (setq file (org-wikinodes-which-file target))
-		   (org-find-exact-headling-in-buffer
+		   (org-find-exact-headline-in-buffer
 		    target (or (get-file-buffer file)
 			       (find-file-noselect file))))))
     (if pos
@@ -288,7 +288,7 @@ with working links."
 	  (delete-region (match-beginning 0) (match-end 0))
 	  (save-match-data
 	    (cond
-	     ((org-find-exact-headling-in-buffer link (current-buffer))
+	     ((org-find-exact-headline-in-buffer link (current-buffer))
 	      ;; Found in current buffer
 	      (insert (format "[[#%s][%s]]" link link)))
 	     ((eq org-wikinodes-scope 'file)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3f667254e..90c693536 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -5118,7 +5118,7 @@ The modified list may contain inherited tags, and tags matched by
 	  (throw 'exit list))
       (while (setq time (pop gridtimes))
 	(unless (and remove (member time have))
-	  (setq time (int-to-string time))
+	  (setq time (format "%2d" time))
 	  (push (org-format-agenda-item
 		 nil string "" nil
 		 (concat (substring time 0 -2) ":" (substring time -2)))
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index cae7be6a3..de52410ee 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -472,7 +472,8 @@ matching filenames."
 	(unless (plist-get (cdr prj) :components)
 	  ;; [[info:org:Selecting%20files]] shows how this is supposed to work:
 	  (let* ((r (plist-get (cdr prj) :recursive))
-		 (b (expand-file-name (plist-get (cdr prj) :base-directory)))
+		 (b (expand-file-name (file-name-as-directory
+				       (plist-get (cdr prj) :base-directory))))
 		 (x (or (plist-get (cdr prj) :base-extension) "org"))
 		 (e (plist-get (cdr prj) :exclude))
 		 (i (plist-get (cdr prj) :include))