Fix Sgrep command, etc.