Fix other uses of shell