diff --git a/dropdown-list.el b/dropdown-list.el
index ed4e3dd..bf55ebe 100644
--- a/dropdown-list.el
+++ b/dropdown-list.el
@@ -250,4 +250,5 @@ Use multiple times to bind different COMMANDs to the same KEY."
 ;;; dropdown-list.el ends here
 ;; Local Variables:
 ;; coding: utf-8
+;; byte-compile-warnings: (not cl-functions)
 ;; End:
diff --git a/yasnippet.el b/yasnippet.el
index ed6644f..fb977d5 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -136,6 +136,15 @@
 (require 'easymenu)
 (require 'help-mode)
 
+(eval-when-compile
+  (defvar yas--editing-template)
+  (defvar yas--guessed-modes)
+  (defvar yas--indent-original-column)
+  (defvar yas--scheduled-jit-loads)
+  (defvar yas-keymap)
+  (defvar yas-selected-text)
+  (defvar yas-verbosity))
+
 
 ;;; User customizable variables
 
@@ -1849,7 +1858,7 @@ This works by stubbing a few functions, then calling
             (when (file-exists-p elfile)
               (insert ";;; .yas-setup.el support file if any:\n;;;\n")
               (insert-file-contents elfile)
-              (end-of-buffer)
+              (goto-char (point-max))
               )))
          (yas-define-snippets
           (mode snippets)
@@ -4564,4 +4573,5 @@ upon.")
 ;;; yasnippet.el ends here
 ;; Local Variables:
 ;; coding: utf-8
+;; byte-compile-warnings: (not cl-functions)
 ;; End: