Minor fixes for genre consolidation