Build scripts updates