diff --git a/device.mk b/device.mk
index 020a585..b2ab357 100644
--- a/device.mk
+++ b/device.mk
@@ -98,6 +98,7 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     libcamera_metadata.vendor \
+    libcamera_metadata_shim \
     libdng_sdk.vendor \
     libexpat.vendor \
     libpng.vendor
@@ -421,6 +422,12 @@ PRODUCT_PACKAGES += \
     android.hardware.radio.config@1.3.vendor \
     android.hardware.radio@1.6.vendor
 
+# Required for QPR3
+PRODUCT_PACKAGES += \
+    libjsoncpp.vendor \
+    libsqlite.vendor \
+    libdumpstateutil.vendor
+
 # Secure Element
 PRODUCT_PACKAGES += \
     android.hardware.secure_element@1.2.vendor
diff --git a/extract-files.sh b/extract-files.sh
index 2967ea8..2c8c541 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -107,6 +107,7 @@ function blob_fixup {
             ;;
         vendor/lib64/hw/mt6789/android.hardware.camera.provider@2.6-impl-mediatek.so)
             "${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
+            grep -q libcamera_metadata_shim.so "${2}" || "${PATCHELF}" --add-needed libcamera_metadata_shim.so "${2}"
             ;;
         vendor/bin/hw/vendor.mediatek.hardware.mtkpower@1.0-service | vendor/lib64/android.hardware.power-service-mediatek.so)
         "${PATCHELF}" --replace-needed "android.hardware.power-V2-ndk_platform.so" "android.hardware.power-V2-ndk.so" "$2"