More fallback cleanups