Build tools changes