diff --git a/.idea/misc.xml b/.idea/misc.xml
index b8fbcee..0ae197e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -53,7 +53,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/icc_rpc_comprehensive/src/main/java/org/arguslab/icc_rpc_comprehensive/FooActivity.java b/icc_rpc_comprehensive/src/main/java/org/arguslab/icc_rpc_comprehensive/FooActivity.java
index a696465..b19d3d6 100644
--- a/icc_rpc_comprehensive/src/main/java/org/arguslab/icc_rpc_comprehensive/FooActivity.java
+++ b/icc_rpc_comprehensive/src/main/java/org/arguslab/icc_rpc_comprehensive/FooActivity.java
@@ -19,7 +19,8 @@
  * 				BarActivity then return the sensitive data to FooActivity.
  * @dataflow source -> imei -> RemoteService.getData() -> BarActivity's imei2 -> BarActivity's Intent i3 -> BarActivity.setResult(i3) -> FooActivity.onActivityResult(data) -> imei3 -> leak
  *           source -> imei -> RemoteService.getData() -> BarActivity's imei2 -> BarActivity's Intent i3 -> BarActivity.setResult(i3)
- * @number_of_leaks 2
+ *           FooActivity.onActivityResult(data) -> imei3 -> leak
+ * @number_of_leaks 3
  * @challenges The analysis must be able to resolve AIDL, stateful ICC and handle data flow
  * 				across different components.
  */
diff --git a/icc_stateful/src/main/java/org/arguslab/icc_stateful/MainActivity.java b/icc_stateful/src/main/java/org/arguslab/icc_stateful/MainActivity.java
index 0ca2e5e..f0349e0 100644
--- a/icc_stateful/src/main/java/org/arguslab/icc_stateful/MainActivity.java
+++ b/icc_stateful/src/main/java/org/arguslab/icc_stateful/MainActivity.java
@@ -16,7 +16,8 @@
  * 				FooActivity obtains sensitive data and return to MainActivity.
  * @dataflow source -> imei -> i2 -> FooActivity.setResult(i2) -> MainActivity.onActivityResult(data) -> imei3 -> sink
  *           source -> imei -> i2 -> FooActivity.setResult(i2)
- * @number_of_leaks 2
+ *           MainActivity.onActivityResult(data) -> imei3 -> sink
+ * @number_of_leaks 3
  * @challenges The analysis must be able to resolve stateful ICC call and handle data flow
  * 				across different components.
  */