diff --git a/dotfiles/ssh/rc b/dotfiles/ssh/rc
new file mode 100755
index 0000000..885b1c2
--- /dev/null
+++ b/dotfiles/ssh/rc
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+REMOTE_LINK="${HOME}/.ssh/remote_agent.sock"
+
+if test \! -L "${REMOTE_LINK}" -a -n "${SSH_AUTH_SOCK}" ; then
+  ln -sf "${SSH_AUTH_SOCK}" "${REMOTE_LINK}"
+fi
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index 49f85c8..a88e97d 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -47,8 +47,8 @@ endif
 silent! colorscheme solarized8
 " Default ASM syntax for ft support
 let asmsyntax="nasm"
-" Allow file modelines
-set modeline
+" Too risky to allow file modelines
+set nomodeline
 " Automatically re-read changed files
 set autoread
 " fsync() after writing files
diff --git a/install.sh b/install.sh
index 72415d0..68af95e 100755
--- a/install.sh
+++ b/install.sh
@@ -49,7 +49,7 @@ prerequisites() {
 install_dotfile_dir() {
   local SRCDIR="${1}"
   local dotfile
-  local submodule_prune="$(git submodule status -- "${SRCDIR}" 2>/dev/null | \
+  local submodule_prune="$(git -C "${BASEDIR}" submodule status -- "${SRCDIR}" 2>/dev/null | \
     awk '{print $2}' | \
     while read submod ; do
       echo -n " -o -path ${BASEDIR}/${submod}"