Correct manifest and sample types