fallback fixes
minor