Improved auto-clock-adjust and short stat