Make better use of UUIDs on Intel platform wks files