Handle some more paths-with-spaces issues