update support-checking and fallbacks