few changes to work with zsh