Last batch of changes.