diff --git a/lib/grep.zsh b/lib/grep.zsh
index 276fec382..27af6e36e 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -20,5 +20,4 @@ elif grep-flag-available --exclude=.cvs; then
 fi
 unfunction grep-flag-available
 
-export GREP_OPTIONS="$GREP_OPTIONS"
 export GREP_COLOR='1;32'
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 0058c643b..c06f2a762 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,5 +1,7 @@
 # Path to your oh-my-zsh installation.
 export ZSH=$HOME/.oh-my-zsh
+export PATH=$HOME/bin:/usr/local/bin:/usr/bin:$PATH
+cd $HOME
 
 # Set name of the theme to load.
 # Look in ~/.oh-my-zsh/themes/
@@ -51,7 +53,6 @@ source $ZSH/oh-my-zsh.sh
 
 # User configuration
 
-export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
 
 # You may need to manually set your language environment