diff --git a/BoardConfig.mk b/BoardConfig.mk
index 407e8e8..e58f93c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,14 +21,14 @@ DEVICE_PATH := device/samsung/matissewifi
 # Assert
 TARGET_OTA_ASSERT_DEVICE := matisse,matissewifi,matissewifiue
 
-# Kernel
-TARGET_KERNEL_CONFIG := lineage_matissewifi_defconfig
-
 # HIDL
 DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
 
+# Kernel
+TARGET_KERNEL_CONFIG := lineage_matissewifi_defconfig
+
 # SELinux
 include $(DEVICE_PATH)/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 df1659a..bc82d4e 100644
--- a/device.mk
+++ b/device.mk
@@ -29,7 +29,7 @@ PRODUCT_PACKAGES += \
     android.hardware.ir@1.0-service.samsung
 
 # 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)