Fix issues with file path