Build script changes.
Optimization.