Small daemon improvement