Daemon scripts improved