Working around zsh quirks