Quite a few bug fixes to the TimerService.