Fix Build tools