uuid fixes, adding serialization fixes