Minor tweaks
Working find of daemon