diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index 062f38a7c..0c2b647f3 100644
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@@ -64,6 +64,7 @@
 (defvar org-outline-regexp)
 (defvar org-property-re)
 (defvar org-startup-options)
+(defvar org-tag-re)
 (defvar org-time-stamp-formats)
 (defvar org-todo-keywords-1)
 (defvar org-todo-line-regexp)
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 2d771671a..cae6900f4 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -179,7 +179,7 @@
     ("et" . "estonian")
     ("eu" . "basque")
     ("fi" . "finnish")
-    ("fr" . "frenchb")
+    ("fr" . "french")
     ("fr-ca" . "canadien")
     ("gl" . "galician")
     ("hr" . "croatian")