Fixed Daemon bugs