Attack skipping fixes