Fail on any error
Build scripts refactor
Fix
Fix