UUID Fixes