Some more tuning to bring back the good analysis times