Some fix on timers