Service Timer Fixes

Various Fixes