diff --git a/src/server.c b/src/server.c
index 9b3a068..46fb022 100644
--- a/src/server.c
+++ b/src/server.c
@@ -172,7 +172,7 @@ nextProcess:
       goto nextProcess;      // parent was already visited, so find next process from parent
     } else {
       // no parent - scan for unvisited process
-      while (current != NULL && current->visited == 1) current = current->next;
+      while (current != NULL && current->visited) current = current->next;
     }
   }
 }
@@ -212,7 +212,7 @@ nextProcess:
       goto nextProcess;      // parent was already visited, so find next process from parent
     } else {
       // no parent - scan for unvisited process
-      while (current != NULL && current->visited == 1) current = current->next;
+      while (current != NULL && current->visited) current = current->next;
     }
   }
 
@@ -225,7 +225,7 @@ nextProcess:
 
       Process *parent = current->parent;
       parent->cCpuTime += current->cCpuTime;
-      parent->cMemory += current->cCpuTime;
+      parent->cMemory += current->cMemory;
       parent->cSwap += current->cSwap;
       parent->cRead += current->cRead;
       parent->cWrite += current->cWrite;