WDT related updates