Various enhancements for enforcing language version in fallback