diff --git a/core/core-company.el b/core/core-company.el
index 69c8fc5ac..469d1b71c 100644
--- a/core/core-company.el
+++ b/core/core-company.el
@@ -1,8 +1,6 @@
 ;;; core-company.el --- auto completion backend (Company-mode)
 ;; see lib/company-macros.el
 
-(eval-when-compile (require 'core))
-
 (use-package company
   :commands (global-company-mode company-complete-common company-dict
              company-files company-tags company-ispell company-yasnippet
diff --git a/core/core-vars.el b/core/core-vars.el
index c23844353..d5f4ea70d 100644
--- a/core/core-vars.el
+++ b/core/core-vars.el
@@ -19,7 +19,7 @@
                               messages-buffer-mode)
   "A list of regexps or modes whose buffers are considered unreal, and will be
 ignored when using `narf:next-real-buffer' and `narf:previous-real-buffer', and
-killed by `narf:kill-unreal-buffers'.
+killed by `narf/kill-unreal-buffers'.
 
 `narf:kill-this-buffer' will also gloss over these buffers when finding a new
 buffer to display.")
diff --git a/core/core-workgroups.el b/core/core-workgroups.el
index ce09d3934..093a8c51a 100644
--- a/core/core-workgroups.el
+++ b/core/core-workgroups.el
@@ -4,6 +4,7 @@
 (use-package workgroups2
   :when (display-graphic-p)
   :init
+  (add-hook! after-init 'workgroups-mode)
   (setq-default
    wg-session-file          (expand-file-name "wg-default" narf-temp-dir)
    wg-workgroup-directory   (expand-file-name "workgroups" narf-temp-dir)
@@ -52,7 +53,7 @@ lib/defuns-workgroups.el.")
   (advice-add 'wg-change-modeline :override 'ignore)
 
   ;; Don't remember popup windows
-  (add-hook! (kill-emacs) 'narf-popup-close-all))
+  (add-hook! kill-emacs 'narf-popup-close-all))
 
 (provide 'core-workgroups)
 ;;; core-workgroups.el ends here
diff --git a/core/core.el b/core/core.el
index cd67c7273..a1f1ffdd6 100644
--- a/core/core.el
+++ b/core/core.el
@@ -13,6 +13,7 @@
 ;;
 ;;;
 
+;; Ask for confirmation on exit only if there are real buffers left
 (when window-system
   (setq confirm-kill-emacs
         (lambda (_)
@@ -72,13 +73,15 @@
 
 ;; Bootstrap ;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(autoload 'use-package "use-package" "" nil 'macro)
+(require 'dash)
+
 (unless (require 'autoloads nil t)
   (load (concat narf-emacs-dir "scripts/generate-autoloads.el"))
   (require 'autoloads))
 (require 'core-vars)
 (require 'core-defuns)
 
-(autoload 'use-package "use-package" "" nil 'macro)
 (eval-when-compile
   (setq use-package-verbose nil)
 
@@ -135,6 +138,12 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(require (cond (IS-MAC      'core-os-osx)
+               (IS-LINUX    'core-os-linux)
+               (IS-WINDOWS  'core-os-win32)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (defun narf-init ()
   (setq-default
    gc-cons-threshold 16777216
diff --git a/core/lib/defuns-compile.el b/core/lib/defuns-compile.el
index e42716ed6..13dd1e427 100644
--- a/core/lib/defuns-compile.el
+++ b/core/lib/defuns-compile.el
@@ -1,7 +1,5 @@
 ;;; defuns-compile.el
 
-;; (eval-when-compile (require 'core))
-
 ;;;###autoload
 (defun narf/is-recompilable-p ()
   "Does an .elc file exist and is this file in the .emacs.d folder?"
diff --git a/init-packages.el b/init-packages.el
index a0263e5db..36d2b6241 100644
--- a/init-packages.el
+++ b/init-packages.el
@@ -10,7 +10,7 @@
 (defconst narf-modules-dir   (concat narf-emacs-dir "modules/"))
 (defconst narf-contrib-dir   (concat narf-emacs-dir "contrib/"))
 (defconst narf-private-dir   (concat narf-emacs-dir "private/"))
-(defconst narf-packages-dir  (concat narf-emacs-dir ".packages/"))
+(defconst narf-packages-dir  (concat narf-emacs-dir ".cask/" emacs-version "/elpa/"))
 
 (defconst narf-script-dir    (concat narf-emacs-dir "scripts/"))
 (defconst narf-dropbox-dir   "~/Dropbox/")
@@ -51,14 +51,11 @@
                                 (list (concat narf-core-dir "lib"))
                                 (list (concat narf-modules-dir "lib"))
                                 (--subdirs narf-contrib-dir)
-                                (--subdirs (concat narf-packages-dir "el-get/"))
+                                (--subdirs narf-packages-dir)
                                 load-path))))
 
 ;;;;;;;;;;;;;;;;
 
-(autoload 'use-package "use-package" "" nil 'macro)
-(require 'dash)
-
 (when (file-exists-p "~/.emacs.local.el")
   (load "~/.emacs.local.el"))