Minor changes in daemon