diff --git a/core/main.mk b/core/main.mk
index e0bf6ea..0400856 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1606,7 +1606,7 @@
   endif
 
   ifeq ($(EMMA_INSTRUMENT),true)
-    $(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE_TARGET)
+    $(JACOCO_REPORT_CLASSES_ALL) : $(modules_to_install)
     $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))
   endif
 
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 2895801..8ced9ab 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -323,7 +323,7 @@
     telephony-common \
     voip-common \
     ims-common \
-    framework-sdkext \
+    framework-sdkextensions \
     ike \
     updatable-media \
     framework-tethering
@@ -332,7 +332,7 @@
     com.android.conscrypt:conscrypt \
     com.android.ipsec:ike \
     com.android.media:updatable-media \
-    com.android.sdkext:framework-sdkext \
+    com.android.sdkext:framework-sdkextensions \
     com.android.tethering:framework-tethering
 
 PRODUCT_COPY_FILES += \
diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk
index 4f7602d..9df26a9 100644
--- a/target/product/sdk_phone_x86.mk
+++ b/target/product/sdk_phone_x86.mk
@@ -15,7 +15,6 @@
 #
 QEMU_USE_SYSTEM_EXT_PARTITIONS := true
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
 
 #
 # All components inherited here go to system image
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index b0a0e02..6a6f119 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -62,7 +62,7 @@
           'Warning: releasetools script should be invoked as hermetic Python '
           'executable -- build and run `{}` directly.'.format(script_name[:-3]),
           file=sys.stderr)
-    self.search_path = os.path.realpath(os.path.join(exec_path, '..'))
+    self.search_path = os.path.realpath(os.path.join(os.path.dirname(exec_path), '..'))
 
     self.signapk_path = "framework/signapk.jar"  # Relative to search_path
     self.signapk_shared_library_path = "lib64"   # Relative to search_path