Fix issues with DS_Store