Missed updating some references to timer variables