First batch of corrections