Minor fixes to timer usage