More daemon related changes