diff --git a/doc/org.texi b/doc/org.texi
index 87ed17f46..d01baca20 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3133,10 +3133,12 @@ special faces for some of them.  This can be done using the variable
 @code{org-todo-keyword-faces}.  For example:
 
 @lisp
+@group
 (setq org-todo-keyword-faces
       '(("TODO"      . org-warning)
         ("DEFERRED"  . shadow)
         ("CANCELED"  . (:foreground "blue" :weight bold))))
+@end group
 @end lisp
 
 While using a list with face properties as shown for CANCELED
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index afd1c6c0d..d901d1633 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -321,7 +321,7 @@ list of attributes, like (:foreground \"blue\" :weight bold :underline t)."
   (if (not value)
       (setq org-tags-special-faces-re nil)
     (setq org-tags-special-faces-re
-	  (concat ":\\(" (mapconcat 'car org-tag-faces "\\|") "\\):"))))
+	  (concat ":\\(" (mapconcat 'car value "\\|") "\\):"))))
 
 (defcustom org-tag-faces nil
   "Faces for specific tags.
diff --git a/lisp/org-w3m.el b/lisp/org-w3m.el
index ce81afc3c..501fc8708 100644
--- a/lisp/org-w3m.el
+++ b/lisp/org-w3m.el
@@ -40,6 +40,9 @@
 ;;      proposed by Richard, i'm just code it.
 ;;
 
+(require 'org)
+(declare-function w3m-anchor "ext:w3m-util" (position))
+
 (defun org-w3m-copy-for-org-mode ()
   "Copy current buffer content or active region with `org-mode' style links.
 This will encode `link-title' and `link-location' with
@@ -138,6 +141,7 @@ Otherwise, return nil."
 
 ;; Install keys into the w3m keymap
 (defvar w3m-mode-map)
+(defvar w3m-minor-mode-map)
 (when (and (boundp 'w3m-mode-map)
 	   (keymapp w3m-mode-map))
   (define-key w3m-mode-map "\C-c\C-x\M-w" 'org-w3m-copy-for-org-mode)