Some changes to source selection.