Fixed some replacements from previous commits