Some (possible) timer fixes