latest fixes on ZSH and emacs