Update timer fixes