Timer error fixes

Some fixes to make timer control a little bit better.