diff --git a/config/includes.chroot.oem/var/lib/pureos-oem/di-preseed.cfg b/config/includes.chroot.oem/var/lib/pureos-oem/di-preseed.cfg
index fd71ae8..4583ce4 100644
--- a/config/includes.chroot.oem/var/lib/pureos-oem/di-preseed.cfg
+++ b/config/includes.chroot.oem/var/lib/pureos-oem/di-preseed.cfg
@@ -1,13 +1,8 @@
-## Options to set on the command line
+## Options for PureOS OEM Installation on first boot
 
-#d-i debian-installer/locale string en_US
-#d-i debian-installer/language boolean true
-#d-i debian-installer/country  boolean true
-#d-i console-setup/ask_detect boolean false
 d-i netcfg/enable boolean false
 d-i clock-setup/utc-auto    boolean true
 d-i clock-setup/utc boolean true
-#d-i time/zone string UTC
 d-i clock-setup/ntp boolean true
 
 d-i apt-setup/cdrom/set-first boolean true
@@ -17,11 +12,12 @@ d-i apt-setup/cdrom/set-failed boolean false
 d-i apt-setup/use_mirror boolean true
 
 d-i mirror/country string manual
-
-d-i  netcfg/get_hostname string librem
-d-i netcfg/get_hostname seen false
 d-i mirror/http/hostname string repo.puri.sm
 d-i mirror/http/directory string /pureos
+d-i mirror/http/proxy string
+
+d-i netcfg/get_hostname string librem
+d-i netcfg/get_hostname seen false
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
 
@@ -33,7 +29,7 @@ d-i partman-lvm/confirm boolean true
 d-i partman-auto-lvm/guided_size string max
 d-i partman-auto/method string crypto
 d-i partman-auto/choose_recipe select root-pureos
-d-i partman-auto-lvm/new_vg_name string encrypted
+d-i partman-auto-lvm/new_vg_name string crypt
 d-i partman/early_command \
        string sed -i.bak 's/-f $id\/skip_erase/-d $id/g' /lib/partman/lib/crypto-base.sh
 d-i partman-auto/expert_recipe string                         \
@@ -53,14 +49,14 @@ d-i partman-auto/expert_recipe string                         \
               2000 2000 2000 linux-swap                       \
                       $lvmok{ } lv_name{ swap }               \
                       method{ swap } format{ }                \
-                      in_vg { encrypted }                     \
+                      in_vg { crypt }                         \
               .                                               \
               1000 1000 1000000000 ext4                       \
                       $lvmok{ } lv_name{ root }               \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ / }                         \
-                      in_vg { encrypted }                     \
+                      in_vg { crypt }                         \
               .
 
 d-i partman-basicfilesystems/no_mount_point boolean false
@@ -69,10 +65,10 @@ d-i partman/choose_partition select finish
 d-i partman/confirm boolean true
 d-i partman/confirm_nooverwrite boolean true
 
-user-setup-udeb	passwd/root-login	boolean	false
+user-setup-udeb	passwd/root-login boolean false
 user-setup-udeb user-setup/encrypt-home boolean true
 
-d-i	popularity-contest/participate	boolean	false
+d-i popularity-contest/participate boolean false
 d-i hw-detect/load_firmware boolean false
 
 d-i grub-installer/only_debian boolean true
diff --git a/config/includes.chroot.oem/var/lib/pureos-oem/install-pureos-oem.py b/config/includes.chroot.oem/var/lib/pureos-oem/install-pureos-oem.py
index 417fcf0..86fc51e 100755
--- a/config/includes.chroot.oem/var/lib/pureos-oem/install-pureos-oem.py
+++ b/config/includes.chroot.oem/var/lib/pureos-oem/install-pureos-oem.py
@@ -74,8 +74,9 @@ class LibremDiskDevice(object):
         disk = parted.freshDisk(device, 'msdos')
         self.logger.debug('created %s', disk)
 
-        # create the rescue disk partition
-        partition_size = round((math.pow(1024.0, parted._exponent['gb']) * 2) / (device.sectorSize)) # 2 GB
+        # create the rescue disk partition - the size has been chosen to d-i's liking, so
+        # it doesn't attempt to truncate or override the partition
+        partition_size = round(2099249152 / (device.sectorSize)) # 2 GB
         self._new_partition(device, disk, 1, partition_size, True)
 
         disk.commit()