Update CCS error fixes and location data