diff --git a/README.md b/README.md
index 51c83af..3b89d54 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ The fingerprints list will update without the need to update the entire module.
 
 Just run the `props` command and the list will be updated automatically. Use the -nw option to disable or disable it completely in the script settings (see ["Prop script settings"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config#prop-script-settings) below). If you've disabled the this setting you can update the list manually in the `Edit device fingerprint` menu.
 
-**_Current fingerprints list version - v39_**
+**_Current fingerprints list version - v40_**
 
 
 ## Please add support for device X
@@ -310,6 +310,12 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 
 
 ## Changelog
+### v2.7.2  
+- Re-run the post-fs-data script if the Magisk image wasn't mounted yet.
+- Added fingeprints for Razer Phone 1 & 2 and Xiaomi Mi Pad 4, and updated fingerprints for Xiaomi Mi 8, Mi A2 & Pocophone F1. List v40.
+- Mostly harmless.
+- Small fixes, as usual.
+
 ### v2.7.1  
 - Fixed an issue when users create custom prints list and configuration files with Windows file endings.
 - Fixed an issue where the currently picked device wouldn't show for the custom prints list.
@@ -499,14 +505,14 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 
 
 ## Current fingerprints list
-### List v39  
+### List v40  
 - Asus Zenfone 2 Laser (6.0.1)
 - Asus Zenfone 4 Max (7.1.1)
 - Asus ZenPad S 8.0 (6.0.1)
 - Essential PH-1 (9)
 - Google Nexus 4 (5.1.1)
 - Google Nexus 5 (6.0.1)
-- Google Nexus 5x (8.1.0)
+- Google Nexus 5X (8.1.0)
 - Google Nexus 6 (7.1.1)
 - Google Nexus 6P (8.1.0)
 - Google Nexus 7 2012 WiFi (5.1.1)
@@ -563,6 +569,8 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 - OnePlus 5T (8.1.0)
 - OnePlus 6 (9)
 - OnePlus 6T (9)
+- Razer Phone (8.1.0)
+- Razer Phone 2 (8.1.0)
 - Samsung Galaxy A8 Plus (7.1.1)
 - Samsung Galaxy Grand Prime (5.0.2)
 - Samsung Galaxy J2 (5.1.1)
@@ -597,7 +605,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 - Sony Xperia XZ Premium (8.0.0)
 - Sony Xperia XZ Premium Dual (8.0.0)
 - Sony Xperia XZ1 (8.0.0)
-- Sony Xperia XZ1 Compact (8.0.0)
+- Sony Xperia XZ1 Compact (9)
 - Sony Xperia XZ1 Dual (8.0.0)
 - Sony Xperia XZ2 (8.0.0)
 - Sony Xperia XZ2 Compact (8.0.0)
@@ -622,14 +630,15 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 - Xiaomi Mi 5S (7.0)
 - Xiaomi Mi 5S Plus (7.0)
 - Xiaomi Mi 6 (8.0.0)
-- Xiaomi Mi 8 (8.1.0)
+- Xiaomi Mi 8 (9)
 - Xiaomi Mi A1 (8.0.0)
-- Xiaomi Mi A2 (8.1.0)
+- Xiaomi Mi A2 (9)
 - Xiaomi Mi Max 2 (7.1.1)
 - Xiaomi Mi Mix 2 (8.0.0)
-- Xiaomi Mi Mix 2S (8.0.0)
+- Xiaomi Mi Mix 2S (9.0.0)
 - Xiaomi Mi Note 2 (8.0.0)
-- Xiaomi Pocophone F1 (8.1.0)
+- Xiaomi Mi Pad 4 (8.1.0)
+- Xiaomi Pocophone F1 (9)
 - Xiaomi Redmi 3/3 Pro (5.1.1)
 - Xiaomi Redmi 3S/X Prime (6.0.1)
 - Xiaomi Redmi 4 Prime (6.0.1)
diff --git a/common/post-fs-data.sh b/common/post-fs-data.sh
index 870583b..3ae5a19 100644
--- a/common/post-fs-data.sh
+++ b/common/post-fs-data.sh
@@ -11,6 +11,9 @@ MODPATH=${0%/*}
 
 # Variables
 IMGPATH=$(dirname "$MODPATH")
+COREPATH=$(dirname "$IMGPATH")
+POSTLOGFILE=$CACHELOC/propsconf_postfile.log
+POSTDEL=0
 
 # Load functions
 . $MODPATH/util_functions.sh
@@ -27,13 +30,16 @@ if [ ! -f "$POSTFILE" ]; then
 	log_handler "Restoring post-fs-data boot script (${POSTFILE})."
 	cp -af $MODPATH/propsconf_post $POSTFILE >> $LOGFILE 2>&1
 	chmod -v 755 $POSTFILE >> $LOGFILE 2>&1
-	placeholder_update $POSTFILE IMGPATH IMG_PLACEHOLDER $IMGPATH
+	placeholder_update $POSTFILE COREPATH CORE_PLACEHOLDER "$COREPATH"
+	placeholder_update $POSTFILE CACHELOC CACHE_PLACEHOLDER "$CACHELOC"
 	# Deleting settings script to force a restore
 	rm -f $LATEFILE
+	POSTDEL=1
 fi
 if [ ! -f "$LATEFILE" ] || [ -f "$RESETFILE" ]; then
 	if [ -f "$RESETFILE" ]; then
 		RSTTXT="Resetting"
+		rm -f $RESETFILE
 	else
 		RSTTXT="Restoring"
 		log_handler "late_start service boot script not found."
@@ -41,9 +47,17 @@ if [ ! -f "$LATEFILE" ] || [ -f "$RESETFILE" ]; then
 	log_handler "$RSTTXT late_start service boot script (${LATEFILE})."
 	cp -af $MODPATH/propsconf_late $LATEFILE >> $LOGFILE 2>&1
 	chmod -v 755 $LATEFILE >> $LOGFILE 2>&1
-	placeholder_update $LATEFILE IMGPATH IMG_PLACEHOLDER $IMGPATH
-	placeholder_update $LATEFILE CACHELOC CACHE_PLACEHOLDER $CACHELOC
-	
+	placeholder_update $LATEFILE POSTFILE POST_PLACEHOLDER "$POSTFILE"
+	placeholder_update $LATEFILE COREPATH CORE_PLACEHOLDER "$COREPATH"
+	placeholder_update $LATEFILE CACHELOC CACHE_PLACEHOLDER "$CACHELOC"
+fi
+
+# Checking if the post-fs-data boot script ran during boot
+if [ -f "$POSTLOGFILE" ] || [ "$POSTDEL" == 1 ]; then
+	if [ "$(cat $POSTLOGFILE | grep "Module no longer installed.")" ] || [ "$POSTDEL" == 1 ]; then
+		log_handler "post-fs-data boot script did not run. Attempting a re-run."
+		. $POSTFILE
+	fi
 fi
 
 log_handler "post-fs-data.sh module script finished.\n\n===================="
diff --git a/common/prints.sh b/common/prints.sh
index be05caa..9b86e0e 100644
--- a/common/prints.sh
+++ b/common/prints.sh
@@ -3,7 +3,7 @@
 # MagiskHide Props Config
 # By Didgeridoohan @ XDA Developers
 
-PRINTSV=39
+PRINTSV=40
 PRINTSTRANSF=250
 
 # Certified fingerprints
@@ -71,6 +71,8 @@ OnePlus 5 (8.1.0)=OnePlus/OnePlus5/OnePlus5:8.1.0/OPM1.171019.011/1809241512:use
 OnePlus 5T (8.1.0)=OnePlus/OnePlus5T/OnePlus5T:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01
 OnePlus 6 (9)=OnePlus/OnePlus6/OnePlus6:9/PKQ1.180716.001/1809150000:user/release-keys__2018-09-05
 OnePlus 6T (9)=OnePlus/OnePlus6T/OnePlus6T:9/PKQ1.180716.001/1811170214:user/release-keys__2018-11-01
+Razer Phone (8.1.0)=razer/cheryl/cheryl:8.1.0/OPM1.171019.011-RZR-180803/6033:user/release-keys__2018-07-05
+Razer Phone 2 (8.1.0)=razer/cheryl2/aura:8.1.0/O-MR2-RC009-RZR-181124/2009:user/release-keys__2018-10-05
 Samsung Galaxy A8 Plus (7.1.1)=samsung/jackpot2ltexx/jackpot2lte:7.1.1/NMF26X/A730FXXU2ARD1:user/release-keys
 Samsung Galaxy Grand Prime (5.0.2)=samsung/fortuna3gdtvvj/fortuna3gdtv:5.0.2/LRX22G/G530BTVJU1BPH4:user/release-keys
 Samsung Galaxy J2 (5.1.1)=samsung/j23gdd/j23g:5.1.1/LMY48B/J200HXXU0AQK2:user/release-keys
@@ -130,14 +132,15 @@ Xiaomi Mi 5/5 Pro (8.0.0)=Xiaomi/gemini/gemini:8.0.0/OPR1.170623.032/V9.6.1.0.OA
 Xiaomi Mi 5S (7.0)=Xiaomi/capricorn/capricorn:7.0/NRD90M/V9.5.4.0.NAGMIFD:user/release-keys
 Xiaomi Mi 5S Plus (7.0)=Xiaomi/natrium/natrium:7.0/NRD90M/V9.6.2.0.NBGMIFD:user/release-keys
 Xiaomi Mi 6 (8.0.0)=Xiaomi/sagit/sagit:8.0.0/OPR1.170623.027/V9.2.3.0.OCAMIEK:user/release-keys
-Xiaomi Mi 8 (8.1.0)=Xiaomi/dipper/dipper:8.1.0/OPM1.171019.011/V9.5.5.0.OEAMIFA:user/release-keys
+Xiaomi Mi 8 (9)=Xiaomi/dipper/dipper:9/PKQ1.180729.001/V10.1.1.0.PEAMIFI:user/release-keys__2018-11-01
 Xiaomi Mi A1 (8.0.0)=xiaomi/tissot/tissot_sprout:8.0.0/OPR1.170623.026/V.9.5.10.0.ODHMIFA:user/release-keys
-Xiaomi Mi A2 (8.1.0)=xiaomi/jasmine/jasmine_sprout:8.1.0/OPM1.171019.011/V9.6.16.0.ODIMIFE:user/release-keys__2018-11-05
+Xiaomi Mi A2 (9)=xiaomi/jasmine/jasmine_sprout:9/PKQ1.180904.001/V10.0.2.0.PDIMIFJ:user/release-keys__2018-12-05
 Xiaomi Mi Max 2 (7.1.1)=Xiaomi/oxygen/oxygen:7.1.1/NMF26F/V9.5.4.0.NDDMIFA:user/release-keys
 Xiaomi Mi Mix 2 (8.0.0)=Xiaomi/chiron/chiron:8.0.0/OPR1.170623.027/V9.6.1.0.ODEMIFD:user/release-keys
 Xiaomi Mi Mix 2S (9.0.0)=Xiaomi/polaris/polaris:9/PKQ1.180729.001/V10.0.6.0.PDGMIFH:user/release-keys__2018-10-01
 Xiaomi Mi Note 2 (8.0.0)=Xiaomi/scorpio/scorpio:8.0.0/OPR1.170623.032/V9.6.1.0.OADCNFD:user/release-keys
-Xiaomi Pocophone F1 (8.1.0)=Xiaomi/beryllium/beryllium:8.1.0/OPM1.171019.011/V9.6.22.0.OEJMIFD:user/release-keys__2018-08-01
+Xiaomi Mi Pad 4 (8.1.0)=ro.build.fingerprint=Xiaomi/clover/clover:8.1.0/OPM1.171019.019/V10.1.1.0.ODJCNFI:user/release-keys__2018-10-01
+Xiaomi Pocophone F1 (9)=Xiaomi/beryllium/beryllium:9/PKQ1.180729.001/V10.1.3.0.PEJMIFI:user/release-keys__2018-11-01
 Xiaomi Redmi 3/3 Pro (5.1.1)=Xiaomi/ido/ido:5.1.1/LMY47V/V9.6.2.0.LAIMIFD:user/release-keys
 Xiaomi Redmi 3S/X Prime (6.0.1)=Xiaomi/land/land:6.0.1/MMB29M/V9.5.1.0.MALMIFA:user/release-keys
 Xiaomi Redmi 4 Prime (6.0.1)=Xiaomi/markw/markw:6.0.1/MMB29M/V9.5.3.0.MBEMIFA:user/release-keys
diff --git a/common/propsconf_late b/common/propsconf_late
index 0532d17..96167f7 100644
--- a/common/propsconf_late
+++ b/common/propsconf_late
@@ -37,9 +37,6 @@ OPTIONCOLOUR=1
 OPTIONWEB=1
 
 CACHEFILES="
-propsconf.log
-propsconf_last.log
-propsconf_install.log
 propsconf_conf
 reset_mhpc
 "
diff --git a/module.prop b/module.prop
index 312bdff..2e90ca9 100644
--- a/module.prop
+++ b/module.prop
@@ -1,7 +1,7 @@
 id=MagiskHidePropsConf
 name=MagiskHide Props Config
-version=v2.7.1-v39
-versionCode=35
+version=v2.7.2-v40
+versionCode=36
 author=Didgeridoohan
 description=Change your device's fingerprint, to pass SafetyNet's CTS Profile check. Edit prop files for better root hiding. Set/reset prop values set by MagiskHide. Change any prop values easily, and set your own custom props.
 minMagisk=17000