Improvements to conversion selection.