Fix tool installer failures