[WIP] Antivirus improvements

Please do not merge yet