Integrating DNS-SD. Various Fixes.