Some timer system fixes