Fix some timer state corruption.