Move oh-my-zsh fixes to follow oh-my-zsh load