diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2e0a0f1..c26caa3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -22,6 +22,7 @@ TARGET_OTA_ASSERT_DEVICE := htc_hiaeul,hiaeul
 
 # Filesystem
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
+BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3640655872
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 26323451904
diff --git a/cm.mk b/cm.mk
index dcfe65e..ea6cfc8 100644
--- a/cm.mk
+++ b/cm.mk
@@ -3,9 +3,6 @@ $(call inherit-product, device/htc/hiaeul/full_hiaeul.mk)
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-# Enhanced NFC
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
 PRODUCT_NAME := cm_hiaeul
 BOARD_VENDOR := htc
 TARGET_VENDOR := htc
diff --git a/extract-files.sh b/extract-files.sh
new file mode 100755
index 0000000..5722456
--- /dev/null
+++ b/extract-files.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -e
+
+# Required!
+export DEVICE=hiaeul
+export DEVICE_COMMON=hiae-common
+export VENDOR=htc
+
+./../../$VENDOR/$DEVICE_COMMON/extract-files.sh $@
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
new file mode 100755
index 0000000..cf43ced
--- /dev/null
+++ b/setup-makefiles.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -e
+
+# Required!
+export DEVICE=hiaeul
+export DEVICE_COMMON=hiae-common
+export VENDOR=htc
+
+./../../$VENDOR/$DEVICE_COMMON/setup-makefiles.sh $@