diff --git a/nvim/lib/editing.vim b/nvim/lib/editing.vim
index cc3d1f2..0761180 100644
--- a/nvim/lib/editing.vim
+++ b/nvim/lib/editing.vim
@@ -62,7 +62,7 @@ set foldmethod=marker
 " Mappings {{{
 
   " arguably one of the most useful mappings
-  nnoremap <silent><expr> <CR> empty(&buftype) ? ":w\<CR>" : "\<CR>"
+  nnoremap <silent><expr> <CR> &buftype is# '' ? ":w\<CR>" : "\<CR>"
 
   " stay in the Visual mode when using shift commands
   xnoremap < <gv
diff --git a/nvim/lib/interface.vim b/nvim/lib/interface.vim
index 9df10bd..d9cfab5 100644
--- a/nvim/lib/interface.vim
+++ b/nvim/lib/interface.vim
@@ -48,11 +48,11 @@ endif
       let l:cmd = a:cmd
       if &modified
         let l:answer = confirm("Save changes?", "&Yes\n&No\n&Cancel")
-        if l:answer is 1      " Yes
+        if l:answer is# 1      " Yes
           write
-        elseif l:answer is 2  " No
+        elseif l:answer is# 2  " No
           let l:cmd .= '!'
-        else                  " Cancel/Other
+        else                   " Cancel/Other
           return
         endif
       endif