More daemon / sorting fixes