diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el
index 064fb59b1..5900f9b4b 100644
--- a/lisp/org-beamer.el
+++ b/lisp/org-beamer.el
@@ -353,10 +353,11 @@ this function dynamically."
 (define-minor-mode org-beamer-mode
   "Special support for editing Org-mode files made to export to beamer."
   nil " Bm" nil)
-(font-lock-add-keywords
- 'org-mode
- '((":\\(B_[a-z]+\\|BMCOL\\):" 1 'org-beamer-tag prepend))
- 'prepent)
+(when (fboundp 'font-lock-add-keywords)
+  (font-lock-add-keywords
+   'org-mode
+   '((":\\(B_[a-z]+\\|BMCOL\\):" 1 'org-beamer-tag prepend))
+   'prepent))
 
 (defun org-beamer-place-default-actions-for-lists ()
   "Find default overlay specifications in items, and move them.
diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el
index ee3944148..1b30dd543 100644
--- a/lisp/org-freemind.el
+++ b/lisp/org-freemind.el
@@ -81,6 +81,7 @@
 
 (require 'xml)
 (require 'org)
+(require 'rx)
 (require 'org-exp)
 (eval-when-compile (require 'cl))
 
diff --git a/lisp/org.el b/lisp/org.el
index 7c57edfed..416cd0948 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16297,7 +16297,7 @@ This command does many different things, depending on context:
 	   (fboundp org-finish-function))
       (funcall org-finish-function))
      ((run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-hook))
-     ((or (looking-at (org-re org-property-start-re))
+     ((or (looking-at org-property-start-re)
 	  (org-at-property-p))
       (call-interactively 'org-property-action))
      ((org-on-target-p) (call-interactively 'org-update-radio-target-regexp))