Daemon: tiny cosmetic changes