Fixed GUID references