Use File::Spec->catfile to compose certain paths

Surrounding them with double quotes worked on Windows, but
created problems on other systems.