diff --git a/config/common.mk b/config/common.mk
index d32640c..197e906 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -218,8 +218,8 @@
 
 # Terminal Emulator
 PRODUCT_COPY_FILES +=  \
-    vendor/cm/proprietary/Term.apk:system/app/Term.apk \
-    vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
+    vendor/cm/proprietary/Term.apk:system/app/Term/Term.apk \
+    vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/app/Term/lib/arm/libjackpal-androidterm4.so
 
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.sys.root_access=1
@@ -232,7 +232,7 @@
 
 PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/common
 
-PRODUCT_VERSION_MAJOR = 11
+PRODUCT_VERSION_MAJOR = 12
 PRODUCT_VERSION_MINOR = 0
 PRODUCT_VERSION_MAINTENANCE = 0-RC0
 
diff --git a/prebuilt/common/bin/backuptool.functions b/prebuilt/common/bin/backuptool.functions
index 6c01da0..10d66a4 100644
--- a/prebuilt/common/bin/backuptool.functions
+++ b/prebuilt/common/bin/backuptool.functions
@@ -5,7 +5,7 @@
 
 export C=/tmp/backupdir
 export S=/system
-export V=11
+export V=12
 
 backup_file() {
   if [ -e "$1" ]; then
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 9bd9c12..35ba51c 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -5,7 +5,7 @@
 
 export C=/tmp/backupdir
 export S=/system
-export V=11
+export V=12
 
 # Preserve /system/addon.d in /tmp/addon.d
 preserve_addon_d() {
diff --git a/sepolicy/fs_use b/sepolicy/fs_use
deleted file mode 100644
index 2001c9c..0000000
--- a/sepolicy/fs_use
+++ /dev/null
@@ -1,3 +0,0 @@
-# Label inodes via getxattr.
-fs_use_xattr f2fs u:object_r:labeledfs:s0;
-
diff --git a/sepolicy/sepolicy.mk b/sepolicy/sepolicy.mk
index a469015..45792a1 100644
--- a/sepolicy/sepolicy.mk
+++ b/sepolicy/sepolicy.mk
@@ -9,7 +9,6 @@
 BOARD_SEPOLICY_UNION += \
     file.te \
     file_contexts \
-    fs_use \
     genfs_contexts \
     seapp_contexts \
     installd.te \
diff --git a/sepolicy/system.te b/sepolicy/system.te
index acf8fed..4c6de38 100644
--- a/sepolicy/system.te
+++ b/sepolicy/system.te
@@ -1 +1 @@
-allow system wallpaper_file:file relabelto;
+allow system_server wallpaper_file:file relabelto;
diff --git a/sepolicy/vold.te b/sepolicy/vold.te
index 3082575..ae52a5f 100644
--- a/sepolicy/vold.te
+++ b/sepolicy/vold.te
@@ -2,9 +2,8 @@
 allow vold sdcard_external:file create_file_perms;
 
 # Allow vold to change context for mounted ext4 sdcard
-relabelto_domain(vold)
 allow vold labeledfs:filesystem { relabelfrom };
-allow vold sdcard_external:filesystem { relabelfrom relabelto };
+allow vold sdcard_external:filesystem { relabelfrom };
 
 # Allow vold to access fuse for fuse-based fs
 allow vold fuse_device:chr_file rw_file_perms;