More shell escape fixes.