Zerconf subscribe
Tweaks