diff --git a/BoardConfig.mk b/BoardConfig.mk
index 37ea978..a3a6bca 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -19,14 +19,14 @@ include device/samsung/matisse-common/BoardConfigCommon.mk
 # Assert
 TARGET_OTA_ASSERT_DEVICE := matisse,matissewifi,matissewifiue
 
-# Kernel
-TARGET_KERNEL_CONFIG := lineage_matissewifi_defconfig
-
 # HIDL
 DEVICE_MANIFEST_FILE += device/samsung/matissewifi/manifest.xml
 
+# Kernel
+TARGET_KERNEL_CONFIG := lineage_matissewifi_defconfig
+
 # SELinux
 include device/samsung/matissewifi/sepolicy/sepolicy.mk
 
 # inherit from the proprietary version
--include vendor/samsung/matissewifi/BoardConfigVendor.mk
+include vendor/samsung/matissewifi/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 9640071..a3f36f0 100644
--- a/device.mk
+++ b/device.mk
@@ -33,7 +33,7 @@ PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
 
 # Get non-open-source specific aspects
-$(call inherit-product-if-exists, vendor/samsung/matissewifi/matissewifi-vendor.mk)
+$(call inherit-product, vendor/samsung/matissewifi/matissewifi-vendor.mk)
 
 # common matisse
 $(call inherit-product, device/samsung/matisse-common/matisse.mk)