Fix a few issues with uuid

Change-Id: I239b005668b7d2e623a60b48623381885685b85e