diff --git a/auto-insert/hpp b/auto-insert/hpp
index 57663e7..dd1d015 100644
--- a/auto-insert/hpp
+++ b/auto-insert/hpp
@@ -14,7 +14,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ${1:`(upcase (projectile-project-name))`_`(upcase (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_`(upcase (file-name-extension (buffer-file-name)))`}
+#ifndef ${1:`(upcase (replace-regexp-in-string "-" "_" (projectile-project-name)))`_`(upcase (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_`(upcase (file-name-extension (buffer-file-name)))`}
 #define $1
 
 $0
diff --git a/init.el b/init.el
index 13db636..dbd3a48 100644
--- a/init.el
+++ b/init.el
@@ -1,5 +1,5 @@
 ;;; init.el --- tastytea's Emacs init file.
-;;; Time-stamp: <2019-04-01 01:06:45 CEST>
+;;; Time-stamp: <2019-04-02 14:32:01 CEST>
 
 ;;; Commentary:
 ;;; I am using this file with Emacs 26, but most of it will probably work with
@@ -214,7 +214,7 @@
           projectile-project-configure-cmd
           "cmake -DCMAKE_BUILD_TYPE=Debug \
            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G 'Unix Makefiles' .."
-          projectile-project-compilation-cmd "LC_ALL=C cmake --build .")
+          projectile-project-compilation-cmd "cmake --build .")
 
     (defun my/projectile-kill-buffers-and-change-tabbar-grouping ()
       "Kill project buffers and change tabbar-ruler grouping to user-buffers."
@@ -415,10 +415,11 @@
   ("<f8>" . neotree-toggle))
 
 ;; Git integration.
+(use-package git-commit
+  :pin melpa-stable)
 (unless slow-computer
   (use-package magit
-    :init
-    (use-package git-commit)
+    :pin melpa-stable
     :config
     (defun my/magit-kill-buffers (arg)
       "Restore window configuration and kill all Magit buffers."
@@ -429,10 +430,7 @@
     :bind
     ("C-x g"   . magit-status)
     ("C-x M-g" . magit-dispatch)
-    ;; (:map magit-status-mode-map
-    ;;       ("q"       . my-magit-kill-buffers))
     :custom
-    ;; What's better, mapping q or binding the function here?
     (magit-bury-buffer-function 'my/magit-kill-buffers)))
 
 ;; Draw line in column 80
diff --git a/server/server b/server/server
index deeb3e1..28b3410 100644
--- a/server/server
+++ b/server/server
@@ -1,2 +1,2 @@
-127.0.0.1:51313 17347
+127.0.0.1:51313 11093
 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh
\ No newline at end of file