Some performance changes.