Fix to build tool scripts