Build script improvements.
Build script improvements.