A few fixes for iCloud store on iOS8