Some more EFI changes.