zsh: More fixes for glue