Fix manifest and sample types