MasterChooser improvements.