Fix sample name when sample uuids are used
Fix specs