Fixes for zsh