more csh cases fixed