Fallback system fixes