Fixed compatibility issues with Infection.