Defensive changes needed