Virus optimizations
Beamcode fix