Add some fixes
Fix uuid