[PATCH] EFI fixes