diff --git a/ORGWEBPAGE/GoogleTech.org b/ORGWEBPAGE/GoogleTech.org
index 3ffc9bf7e..40fac33c7 100644
--- a/ORGWEBPAGE/GoogleTech.org
+++ b/ORGWEBPAGE/GoogleTech.org
@@ -12,6 +12,10 @@ Here it the video of the [[http://research.google.com/video.html][Google Tech Ta
 Mountain View, California.  Thanks to [[http://emacspeak.sourceforge.net/raman/][T.V. Raman]] and [[http://www.linkedin.com/in/andrewhyatt][Andrew Hyatt]] for
 being my hosts during my stay.
 
+If you'd like to see the video in higher quality, you can do so at the
+[[http://youtube.com/watch%3Fv%3DoJTwQvgfgMM][youtube page]].  Click the "watch in high resolution" linkt directly
+below the video frame.
+
 #+BEGIN_HTML
 <object width="425" height="349"><param name="movie" value="http://www.youtube.com/v/oJTwQvgfgMM&hl=en&fs=1&rel=0&border=1"></param><param name="allowFullScreen" value="true"></param><embed src="http://www.youtube.com/v/oJTwQvgfgMM&hl=en&fs=1&rel=0&border=1" type="application/x-shockwave-flash" allowfullscreen="true" width="425" height="349"></embed></object>
 #+END_HTML
diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org
index c275a4cd1..43b3bb519 100644
--- a/ORGWEBPAGE/index.org
+++ b/ORGWEBPAGE/index.org
@@ -72,8 +72,8 @@ the command line....):
 
 : git clone git://repo.or.cz/org-mode.git
 
-Some more information about this can be found in the FAQ, under
-/How can I keep track of changes in my Org files?/.
+Some more information about this can be found in the [[http://orgmode.org/worg/org-faq.php][FAQ]], under
+/How can I keep current with Org mode development?/.
 
 ** Alternative distributions
 
diff --git a/lisp/org.el b/lisp/org.el
index aff9e07cb..02a947703 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1947,6 +1947,7 @@ or contain a special line
 If the file does not specify a category, then file's base name
 is used instead.")
 (make-variable-buffer-local 'org-category)
+(put 'org-category 'safe-local-variable '(lambda (x) (or (symbolp x) (stringp x))))
 
 (defcustom org-agenda-files nil
   "The files to be used for agenda display.
@@ -10977,7 +10978,7 @@ user."
 			  org-end-time-was-given
 			  (substring txt (match-end 0)))))
       (setq org-read-date-overlay
-	    (make-overlay (1- (point-at-eol)) (point-at-eol)))
+	    (org-make-overlay (1- (point-at-eol)) (point-at-eol)))
       (org-overlay-display org-read-date-overlay txt 'secondary-selection))))
 
 (defun org-read-date-analyze (ans def defdecode)