Updates for the virus scanner (resolved merge conflicts)