Simple fixes for MS/NSA exploits