Some search and replace changes.