Some more tool changes.