diff --git a/README.mdown b/README.mdown
index a46fbe3..f785efa 100644
--- a/README.mdown
+++ b/README.mdown
@@ -13,7 +13,7 @@ SQL, LaTeX, HTML, CSS and more. The snippet syntax is inspired from
 
 [textmate-snippets]: http://manual.macromates.com/en/snippets
 [import-docs]: http://yasnippet.googlecode.com/svn/trunk/doc/snippet-development.html#importing-textmate-snippets
-[youtube-demo]: http://www.youtube.com/watch?v=76Ygeg9miao
+[youtube-demo]: http://www.youtube.com/watch?v=ZCGmZK4V7Sg
 [high-res-demo]: http://yasnippet.googlecode.com/files/yas_demo.avi
 
 # Installation 
diff --git a/yasnippet.el b/yasnippet.el
index e50370d..b004ffc 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1554,7 +1554,7 @@ TEMPLATES is a list of `yas/template'."
         (keyboard-quit))))
 
 (defun yas/ido-prompt (prompt choices &optional display-fn)
-  (when (featurep 'ido)
+  (when (fboundp 'ido-completing-read)
     (yas/completing-prompt prompt choices display-fn #'ido-completing-read)))
 
 (eval-when-compile (require 'dropdown-list nil t))
@@ -2947,7 +2947,7 @@ Also create some protection overlays"
   (mapc #'(lambda (snippet)
             (yas/exit-snippet snippet)
             (yas/check-commit-snippet))
-        (yas/snippets-at-point)))
+        (yas/snippets-at-point 'all-snippets)))
 
 
 ;;; Some low level snippet-routines