Fixed quoting on all paths for space issues