Various fixes in string extractor tool