Minor fixes for Timer class