timer service fixes