more fixes to timers