Build scripts fix