diff --git a/BoardConfig.mk b/BoardConfig.mk
index ff43bcd..1f5e92b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -32,7 +32,7 @@
 BOARD_USES_ALSA_AUDIO := true
 
 # Asserts
-TARGET_OTA_ASSERT_DEVICE := gprimeltevl,gprimeltecan,samsung_sm_g530w
+TARGET_OTA_ASSERT_DEVICE := gprimeltecan,samsung_sm_g530w,g530w
 
 # Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth
@@ -112,8 +112,7 @@
 TARGET_KERNEL_VARIANT_CONFIG := msm8916_sec_fortuna_can_defconfig
 TARGET_KERNEL_SELINUX_CONFIG := selinux_defconfig
 TARGET_KERNEL_SELINUX_LOG_CONFIG := selinux_log_defconfig
-TARGET_KERNEL_SOURCE := kernel/samsung/gprimeltecan
-#TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel
+TARGET_KERNEL_SOURCE := kernel/samsung/grandprime
 
 # Lights
 TARGET_PROVIDES_LIBLIGHT := false
@@ -259,7 +258,6 @@
 	make -C device/samsung/gprimeltecan/wlan/prima/ WLAN_ROOT=$(ANDROID_BUILD_TOP)/device/samsung/gprimeltecan/wlan/prima/ \
 		KERNEL_SOURCE=$(KERNEL_OUT) ARCH="arm" \
 		CROSS_COMPILE="arm-eabi-"
-#		CROSS_COMPILE=$(ANDROID_BUILD_TOP)/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi-
 	mkdir $(KERNEL_MODULES_OUT)/$(WLAN_CHIPSET)/ -p
 	ln -sf /system/lib/modules/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko $(TARGET_OUT)/lib/modules/wlan.ko
 	mv device/samsung/gprimeltecan/wlan/prima/wlan.ko $(KERNEL_MODULES_OUT)/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko