More work on grub-efi