Properly escaped all directories used by subprocesses.
Fixed merge conflict with bad change.