Fix small bugs with GUIDs
v.3.0.4.15