More debug changes around timers