Update fallbacks and logging