diff --git a/emacs.el b/emacs.el
index 25b32cc..58aa54d 100644
--- a/emacs.el
+++ b/emacs.el
@@ -1164,14 +1164,16 @@ delete; o: select other; j, l: enlarge; h, k: shrink; q: quit."
       recentf-show-file-shortcuts-flag nil)
 
 (when (require 'recentf nil t)
+  (add-hook 'recentf-mode-hook
+            'recentf-save-list)
   (recentf-mode 1)
   (add-to-list 'recentf-exclude (regexp-quote recentf-save-file))
   (define-key ctl-x-map (kbd "C-r") 'recentf-open-files)
   (add-hook 'find-file-hook
             'recentf-save-list
             t)   ; save to file immediately after adding file to recentf list
-  (remove-hook 'kill-emacs-hook
-               'recentf-save-list)
+  (add-hook 'kill-emacs-hook
+            'recentf-load-list)
   ;; (add-hook 'find-file-hook
   ;;           (lambda ()
   ;;             (recentf-add-file default-directory)))
diff --git a/setup.sh b/setup.sh
index 384ad1a..d24df8c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -95,6 +95,7 @@ mac_defaults(){
 mac_start_daemon(){
     test "`uname`" = Darwin || return 1
 
+    sudo launchctl setenv LC_ALL C
     sudo launchctl load -w /System/Library/LaunchDaemons/com.apple.locate.plist
 }