Fix wdt interface + minor edits