Duplicate GUID fixes