diff --git a/universal7885-common/Android.mk b/universal7885-common/Android.mk
index 42d4e88..e054287 100644
--- a/universal7885-common/Android.mk
+++ b/universal7885-common/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter a20 a20e $(TARGET_DEVICE)),)
+ifneq ($(filter a20 a20e, $(TARGET_DEVICE)),)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk
index bdf85b5..81c2c5a 100644
--- a/universal7885-common/BoardConfigCommon.mk
+++ b/universal7885-common/BoardConfigCommon.mk
@@ -51,7 +51,7 @@ BOARD_KERNEL_IMAGE_NAME := Image
 BOARD_KERNEL_BASE := 0x10000000
 BOARD_KERNEL_PAGESIZE := 2048
 BOARD_MKBOOTIMG_ARGS := --kernel_offset 0x00008000 --ramdisk_offset 0x01000000 --tags_offset 0x00000100
-TARGET_KERNEL_SOURCE := kernel/samsung/universal7884B
+TARGET_KERNEL_SOURCE := kernel/samsung/exynos7885
 TARGET_KERNEL_CLANG_COMPILE := true
 
 # HIDL
diff --git a/universal7885-common/SamsungParts/AndroidManifest.xml b/universal7885-common/SamsungParts/AndroidManifest.xml
index 775a676..1bfc5c8 100644
--- a/universal7885-common/SamsungParts/AndroidManifest.xml
+++ b/universal7885-common/SamsungParts/AndroidManifest.xml
@@ -82,7 +82,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".battery.BatteryActivity"
+            android:name="com.eurekateam.samsungparts.battery.BatteryActivity"
             android:exported="true"
             android:label="@string/fastcharge_title">
 
diff --git a/universal7885-common/fingerprint.mk b/universal7885-common/fingerprint.mk
new file mode 100644
index 0000000..ffe330a
--- /dev/null
+++ b/universal7885-common/fingerprint.mk
@@ -0,0 +1,7 @@
+PRODUCT_GMS_CLIENTID_BASE := android-google
+
+# Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop
+BUILD_FINGERPRINT := "google/redfin/redfin:12/SPB5.210812.002/7671067:user/release-keys"
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+        PRIVATE_BUILD_DESC="redfin-user 12 SPB5.210812.002 7671067 release-keys"
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index ed3e4f4..d93bbe9 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -7,6 +7,9 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
 # .apex packages
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 
+# Build Fingerprints
+$(call inherit-product, $(LOCAL_PATH)/fingerprint.mk)
+
 # Allow Copying of apks.
 PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true