Tweaked the watchdog to make sure only one instance of each kind can be running (in case of restarted agents)