Fix plugin fallbacks