diff --git a/.bash_completion b/.bash_completion
index bb319e9..6e4033e 100644
--- a/.bash_completion
+++ b/.bash_completion
@@ -1,7 +1,5 @@
 # ~/.bash_completion - Custom bash auto completions
 
 # Enable bash completion for dotfiles manager (if installed)
-if command -v dotfiles &>/dev/null; then
-	source <(dotfiles bash-completion)
-fi
+[[ -x "$HOME/bin/dotfiles" ]] && source <($HOME/bin/dotfiles bash-completion)
 
diff --git a/.config/systemd/user/ssh-agent.service b/.config/systemd/user/ssh-agent.service
index 842aa6f..f20476f 100644
--- a/.config/systemd/user/ssh-agent.service
+++ b/.config/systemd/user/ssh-agent.service
@@ -2,9 +2,9 @@
 Description=SSH key agent
 
 [Service]
-Type=forking
+Type=simple
 Environment=SSH_AUTH_SOCK=%t/ssh-agent.sock
-ExecStart=/usr/bin/ssh-agent -a $SSH_AUTH_SOCK
+ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
 
 [Install]
 WantedBy=default.target
diff --git a/.profile b/.profile
index 1053232..cd11756 100644
--- a/.profile
+++ b/.profile
@@ -13,12 +13,11 @@ export GPG_TTY=$(tty)
 # Environment variables
 export TERMINAL=sakura
 export EDITOR=vim
-export BC_ENV_ARGS="-lq $HOME/.bcrc"
+export BC_ENV_ARGS="-lq"
+[[ -f "$HOME/.bcrc" ]] && export BC_ENV_ARGS="$BC_ENV_ARGS $HOME/.bcrc"
 
 # PATH
-if [[ -d "$HOME/bin" ]]; then
-	export PATH="$HOME/bin:$PATH"
-fi
+[[ -d "$HOME/bin" ]] && export PATH="$HOME/bin:$PATH"
 
 # Android SDK stuff
 #export ANDROID_HOME="/opt/Android_SDK"