Improved bootstrapping using repos::tools