Fix overzealous global replacements