diff --git a/zshrc b/zshrc
index d99e4a0..21af58e 100644
--- a/zshrc
+++ b/zshrc
@@ -18,7 +18,7 @@ alias gm=gm   # graphicsmagick
 alias l='ls -lha'
 alias ar=ar
 
-compdef passc=pass
+which _pass >/dev/null && compdef passc=pass
 
 # History
 setopt APPEND_HISTORY SHARE_HISTORY EXTENDED_HISTORY INC_APPEND_HISTORY \
@@ -26,3 +26,6 @@ setopt APPEND_HISTORY SHARE_HISTORY EXTENDED_HISTORY INC_APPEND_HISTORY \
 HISTSIZE=100000
 SAVEHIST=100000
 HISTFILE=~/.zhist
+
+# OPAM configuration
+. /home/gebner/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true