Fixes to fallbacks