Major import from DSub for stability and quality
Fix GenreAdapter