Updates for zsh and funtoo environment.