Defensive improvements