Fixed GUID changes