diff --git a/zsh/.bash_profile b/zsh/.bash_profile
index 5385a38..582aeee 100644
--- a/zsh/.bash_profile
+++ b/zsh/.bash_profile
@@ -21,7 +21,7 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 
-if [[ -f "~/use_google" ]]; then
-    source ~/.bash_profile.google
+if [[ -f "$HOME/use_google" ]]; then
+    source $HOME/.bash_profile.google
 fi
 source ~/.aliases.sh
diff --git a/zsh/.bash_profile.google b/zsh/.bash_profile.google
index 6d4e5ef..dec1377 100644
--- a/zsh/.bash_profile.google
+++ b/zsh/.bash_profile.google
@@ -72,6 +72,7 @@ alias safergcp=/google/bin/releases/safer-gcp/tools/safergcp
 alias add_deps_to_usages='/google/src/head/depot/google3/apps/framework/tools/add_deps_to_usages.sh'
 alias plxutil='/google/data/ro/teams/plx/plxutil'
 export HGSHORT_CMDS="cat head tail mv cp rm chmod g4 diff merge patch meld trim less more"
+source /etc/bash_completion.d/hgd
 alias hgd='source /google/src/head/depot/google3/experimental/fig_contrib/hgshort/hgd.sh'
 
 export ACID_STARTUP_SCRIPT_PATH=~/acid_startup.sh
diff --git a/zsh/.zshrc b/zsh/.zshrc
index a7ba800..ea75761 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -251,5 +251,4 @@ export FZF_DEFAULT_OPTS="--preview 'echo {}' --preview-window down:3:wrap --bind
 
 source ~/.bash_profile
 export ZSH="$HOME/.oh-my-zsh"
-source /etc/bash_completion.d/hgd
 source $ZSH/oh-my-zsh.sh