Infection system tweaks

Apparently this is supposed to target master. I guess it's a pretty small change.