Fix issues with relative paths