Optimizations changes.