diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4a6c80b..82b4e27 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -57,9 +57,7 @@ BOARD_HAVE_FM_RADIO := true
 BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO
 BOARD_FM_DEVICE := si4709
 
-# FIXME
 BOARD_NAND_PAGE_SIZE := 4096 -s 128
-# FIXME
 BOARD_KERNEL_PAGESIZE := 4096
 BOARD_KERNEL_BASE := 0x40000000
 BOARD_KERNEL_CMDLINE := console=ttySAC2,115200 consoleblank=0
@@ -67,9 +65,7 @@ TARGET_PREBUILT_KERNEL := device/samsung/galaxys2/kernel
 
 BOARD_BOOTIMAGE_PARTITION_SIZE := 8388608
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 536870912
-# FIXME
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 8388608
-# FIXME
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 2147483648
 BOARD_FLASH_BLOCK_SIZE := 4096
 
 # Connectivity - Wi-Fi