More file path cleanup to prevent conflicts with other apps