Add Watchdog configuration and misc bug