CHG: Removed fixed ID and time setting
CHG: Minor improvements during COSI testing