Fix replacements