Fixes for the new bootloader and partition layout