Fix rebuild tools