further enhance UEFI support