mkstage4.zsh: fixes