Bring zsh and fish back in sync