A whole bunch of bug fixes to TimerService.