Fix fallbacks