More corrections from fubarred global replace