Fix image creation for modern GRUB versions