Improvements to CS extractor precision