Final batch of updates