Fixed some problems on UEFI systems