diff --git a/Makefile b/Makefile
index d99f091a2df077e07845822b1fc9b920876e4cd7..717b4b1733d8bdf3183953cae1fdbce35b984dc0 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,6 @@ $(BUILD)/filesystem:
 $(BUILD)/filesystem.bin: $(BUILD)/filesystem
 	mkdir -p $(BUILD)
 	rm -f $@.partial
-	fallocate -l 255MiB $@.partial
+	fallocate -l 254MiB $@.partial
 	redoxfs-ar $@.partial $<
 	mv $@.partial $@
diff --git a/mk/x86-unknown-none.mk b/mk/x86-unknown-none.mk
index 5c115e979703dae9a1ebd9b66248dfa1ac9699b2..e09a95c314779d1b24a2f230f3acd33b5870fc17 100644
--- a/mk/x86-unknown-none.mk
+++ b/mk/x86-unknown-none.mk
@@ -55,10 +55,10 @@ $(BUILD)/harddrive.bin: $(BUILD)/bootloader.bin $(BUILD)/filesystem.bin
 	rm -f $@.partial
 	fallocate -l 256MiB $@.partial
 	$(PARTED) -s -a minimal $@.partial mklabel msdos
-	$(PARTED) -s -a minimal $@.partial mkpart primary 1MiB 100%
+	$(PARTED) -s -a minimal $@.partial mkpart primary 2MiB 100%
 	dd if=$< of=$@.partial bs=1 count=446 conv=notrunc
 	dd if=$< of=$@.partial bs=512 skip=1 seek=1 conv=notrunc
-	dd if=$(BUILD)/filesystem.bin of=$@.partial bs=1MiB seek=1 conv=notrunc
+	dd if=$(BUILD)/filesystem.bin of=$@.partial bs=1MiB seek=2 conv=notrunc
 	mv $@.partial $@
 
 qemu: $(BUILD)/harddrive.bin
diff --git a/mk/x86_64-unknown-uefi.mk b/mk/x86_64-unknown-uefi.mk
index 640ba1a117479ced97fa15115e288f43bdaaacf2..c29980edcdc795c426ba9c89b2d46492f472240e 100644
--- a/mk/x86_64-unknown-uefi.mk
+++ b/mk/x86_64-unknown-uefi.mk
@@ -31,8 +31,8 @@ $(BUILD)/bootloader-live.efi: Cargo.lock Cargo.toml $(shell find src -type f)
 $(BUILD)/esp.bin: $(BUILD)/bootloader.efi
 	mkdir -p $(BUILD)
 	rm -f $@.partial
-	fallocate -l 64MiB $@.partial
-	mkfs.vfat -F 32 $@.partial
+	fallocate -l 1MiB $@.partial
+	mkfs.vfat $@.partial
 	mmd -i $@.partial efi
 	mmd -i $@.partial efi/boot
 	mcopy -i $@.partial $< ::efi/boot/bootx64.efi
@@ -43,11 +43,11 @@ $(BUILD)/harddrive.bin: $(BUILD)/esp.bin $(BUILD)/filesystem.bin
 	rm -f $@.partial
 	fallocate -l 320MiB $@.partial
 	$(PARTED) -s -a minimal $@.partial mklabel gpt
-	$(PARTED) -s -a minimal $@.partial mkpart ESP FAT32 1MiB 65MiB
-	$(PARTED) -s -a minimal $@.partial mkpart REDOXFS 65MiB 100%
+	$(PARTED) -s -a minimal $@.partial mkpart ESP FAT32 1MiB 2MiB
+	$(PARTED) -s -a minimal $@.partial mkpart REDOXFS 2MiB 100%
 	$(PARTED) -s -a minimal $@.partial toggle 1 boot
 	dd if=$(BUILD)/esp.bin of=$@.partial bs=1MiB seek=1 conv=notrunc
-	dd if=$(BUILD)/filesystem.bin of=$@.partial bs=1MiB seek=65 conv=notrunc
+	dd if=$(BUILD)/filesystem.bin of=$@.partial bs=1MiB seek=2 conv=notrunc
 	mv $@.partial $@
 
 $(BUILD)/firmware.rom: