Daemon: Install fixed + cleanup