Build scripts improved