Changes related to how timers are handled