Fix some replaces collateral effects