Add more envars for zsh behavior