Contagion fixes