optimize non-native GUID type declaration
fix GUID type comparator issues