Fix default/fallback variant processing