Fix paths overrides and enclose args in double quotes