Improve tool/bootstrap logging