[QE-1024] Fixing a couple of issues around the monitor thread