Build scripts improvements
Build scripts improvements