Fixed multi-uuid handling