Minor corrections for a clean watchdog, remove ownership toggles - those are better handled elsewhere
