Fix warnings and errors introduced with UUID changes.

llvm-svn: 287208
2 files changed