Upgrade find and replace for fixes