Fixed shell.resolve and fs.combine issue