Address comments from PR

* Make ping? dependent on watcher thread
* Fix default_servers handling
Add slightly more logging