Build scripts tweaks