Build script updates and changes