UEFI fixes and gc change to generic