Fix 4 critical correctness bugs in daemon server#3

schovi merged 1 commit intomainschovi/shelli:mainfrom

fix/phase1-critical-correctnessschovi/shelli:fix/phase1-critical-correctnessCopy head branch name to clipboard