Fix checks for ID and time.