diff --git a/athenax-backend/src/main/java/com/uber/athenax/backend/server/AthenaXConfiguration.java b/athenax-backend/src/main/java/com/uber/athenax/backend/server/AthenaXConfiguration.java
index 75f5f21..256f445 100644
--- a/athenax-backend/src/main/java/com/uber/athenax/backend/server/AthenaXConfiguration.java
+++ b/athenax-backend/src/main/java/com/uber/athenax/backend/server/AthenaXConfiguration.java
@@ -72,7 +72,7 @@ public static class YarnCluster {
     private final Set<String> resourcesToLocalize;
 
     /**
-     * JARs that will be localized and put into the classpaths for bot JobManager and TaskManager.
+     * JARs that will be localized and put into the classpaths for both JobManager and TaskManager.
      */
     @JsonProperty("additional.jars")
     private final Set<String> additionalJars;
diff --git a/athenax-backend/src/main/java/com/uber/athenax/backend/server/jobs/JobWatcherUtil.java b/athenax-backend/src/main/java/com/uber/athenax/backend/server/jobs/JobWatcherUtil.java
index d682c4c..5e8e1b9 100644
--- a/athenax-backend/src/main/java/com/uber/athenax/backend/server/jobs/JobWatcherUtil.java
+++ b/athenax-backend/src/main/java/com/uber/athenax/backend/server/jobs/JobWatcherUtil.java
@@ -150,7 +150,8 @@ static StateView computeState(Map<UUID, JobDefinition> jobs, Map<UUID, InstanceI
 
   static JobDefinitionDesiredstate computeActualState(InstanceInfo info) {
     JobDefinitionResource r = new JobDefinitionResource()
-        .memory(info.status().getAllocatedMB())
+        .memory(info.status().getAllocatedMB() / (info.status().getAllocatedVCores() != 0
+            ? info.status().getAllocatedVCores() : 1))
         .vCores(info.status().getAllocatedVCores());
     JobDefinitionDesiredstate s = new JobDefinitionDesiredstate()
         .clusterId(info.clusterName())
diff --git a/athenax-backend/src/main/java/com/uber/athenax/backend/server/yarn/InstanceManager.java b/athenax-backend/src/main/java/com/uber/athenax/backend/server/yarn/InstanceManager.java
index 4c88885..ee40890 100644
--- a/athenax-backend/src/main/java/com/uber/athenax/backend/server/yarn/InstanceManager.java
+++ b/athenax-backend/src/main/java/com/uber/athenax/backend/server/yarn/InstanceManager.java
@@ -26,6 +26,7 @@
 import com.uber.athenax.vm.compiler.planner.JobCompilationResult;
 import org.apache.flink.annotation.VisibleForTesting;
 import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.JobManagerOptions;
 import org.apache.flink.util.Preconditions;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ApplicationReport;
@@ -210,6 +211,9 @@ void scanAll() throws IOException, YarnException {
         if (instance == null) {
           LOG.warn("Failed to retrieve instance info for {}:{}", cluster.name(), report.getApplicationId());
         } else {
+          instance.status().setAllocatedVCores(instance.status().getAllocatedVCores() - 1);
+          instance.status().setAllocatedMB(instance.status().getAllocatedMB()
+                  - flinkConf.getInteger(JobManagerOptions.JOB_MANAGER_HEAP_MEMORY));
           newInstances.put(instance.metadata().uuid(), instance);
         }
       }
diff --git a/athenax-backend/src/main/java/com/uber/athenax/backend/server/yarn/YarnClusterConfiguration.java b/athenax-backend/src/main/java/com/uber/athenax/backend/server/yarn/YarnClusterConfiguration.java
index 79e3bab..bea3a14 100644
--- a/athenax-backend/src/main/java/com/uber/athenax/backend/server/yarn/YarnClusterConfiguration.java
+++ b/athenax-backend/src/main/java/com/uber/athenax/backend/server/yarn/YarnClusterConfiguration.java
@@ -50,7 +50,7 @@ public class YarnClusterConfiguration {
   private final Set<Path> resourcesToLocalize;
 
   /**
-   * JARs that will be localized and put into the classpaths for bot JobManager and TaskManager.
+   * JARs that will be localized and put into the classpaths for both JobManager and TaskManager.
    */
   private final Set<Path> systemJars;