Added some more replacements.