Fix issues with files