W7-A6 Part 2: Fix vulnerabilities