Improvements to manager selection.