Fixes for zsh compat