some fixes on UUIDs