GUID fixes