Still more shell fixes.