AED: Fix for 30-year stay on destruction, tighter HRE reqs