Some virus fixes