Some fallbacks cleanups