Infection system tweaks

Apparently this is supposed to target master.