diff --git a/ttp/board-base.mk b/ttp/board-base.mk
deleted file mode 100644
index 7c03d5e..0000000
--- a/ttp/board-base.mk
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
diff --git a/ttp/titan_pocket/BoardConfig.mk b/ttp/titan_pocket/BoardConfig.mk
index b23c667..fb830a4 100644
--- a/ttp/titan_pocket/BoardConfig.mk
+++ b/ttp/titan_pocket/BoardConfig.mk
@@ -19,6 +19,7 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
 # no longer has QCOM-specific directories under /.
 BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
 
+TARGET_EXFAT_DRIVER := exfat
 TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
 
 ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
diff --git a/ttp/ttp.mk b/ttp/ttp.mk
index e2356e5..0ab5d95 100644
--- a/ttp/ttp.mk
+++ b/ttp/ttp.mk
@@ -40,6 +40,16 @@ PRODUCT_COPY_FILES += \
 	device/wephone/ttp/files/mtk-tpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-tpd.kl \
 	device/wephone/ttp/files/fingerprint_key.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/fingerprint_key.kl
 
+# Use a more decent APN config
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+ifneq (,$(wildcard external/exfat))
+PRODUCT_PACKAGES += \
+	mkfs.exfat \
+	fsck.exfat
+endif
+
 PRODUCT_PACKAGES += \
 	Conversations \
 	Davx5 \