Fix non-deterministic UUID, and bad comment.  Thanks Andy.