Optimization related changes.