Fixes to timers