DMZ cleanup fixes