Fix replace/replacements