diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fdcaf0e6..859b637c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -40,7 +40,7 @@ alias ghhhh="git log --graph --stat -p --full-diff $pretty_format_medium"; compd
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
-compdef git-svn-dcommit-push=git
+compdef _git git-svn-dcommit-push=git
 
 #
 # Will return the current branch name
@@ -53,8 +53,8 @@ function current_branch() {
 
 # these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
-compdef ggpull=git
+compdef _git ggpull=git
 alias ggpush='git push origin $(current_branch)'
-compdef ggpush=git
+compdef _git ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
-compdef ggpnp=git
+compdef _git ggpnp=git
diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 2263b8fd..04229b7a 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -14,10 +14,6 @@ if [[ "$MODE_INDICATOR" == "" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}<%{$reset_color%}%{$fg[red]%}<<%{$reset_color%}"
 fi
 
-function zle-line-init zle-keymap-select {
-  zle reset-prompt
-}
-
 # If I am using vi keys, I want to know what mode I'm currently using.
 # zle-keymap-select is executed every time KEYMAP changes.
 # From http://zshwiki.org/home/examples/zlewidgets